camerin
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ffmpeg] update to 8.0.1, enable VTBox/mediacodec/d3d12 hwaccels (#3156) 

MediaCodec needs some jvm shenanigans to work, but the others should
Just Work(TM). Need tests on Windows (AMD/Intel), macOS

Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3156
Reviewed-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
This commit is contained in:
crueter 2025-12-13 20:32:37 +01:00
parent 30d75d4e52
commit 363d861011
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with 186 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
externals/ffmpeg/cpmfile.json vendored
View File

@ -1,8 +1,8 @@
{ {
"ffmpeg": { "ffmpeg": {
"repo": "FFmpeg/FFmpeg", "repo": "FFmpeg/FFmpeg",
"sha": "ddf443f1e9", "sha": "5e56937b74",
"hash": "ded1c313843f23805102565bd3ca92602fb9c2951e059ca5e1a486ab3ef7d589acccf3cde05c5ff0cfc5199c3a261dccb4d2a93254e585824850696fb41a292e", "hash": "9ab0457dcd6ce6359b5053c1662f57910d332f68ca0cca9d4134d858464840917027374de3d97e0863c3a7daaea2fe4f4cd17d1c6d8e7f740f4ad91e71c2932b",
"bundled": true "bundled": true
}, },
"ffmpeg-ci": { "ffmpeg-ci": {
@ -10,7 +10,7 @@
"package": "FFmpeg", "package": "FFmpeg",
"name": "ffmpeg", "name": "ffmpeg",
"repo": "crueter-ci/FFmpeg", "repo": "crueter-ci/FFmpeg",
"version": "8.0-ddf443f1e9", "version": "8.0.1-5e56937b74",
"min_version": "4.1" "min_version": "4.1"
} }
} }

7
src/video_core/host1x/ffmpeg/ffmpeg.cpp
View File

@ -17,6 +17,8 @@ extern "C" {
// for querying VAAPI driver information // for querying VAAPI driver information
#include <libavutil/hwcontext_vaapi.h> #include <libavutil/hwcontext_vaapi.h>
#endif #endif
#include <libavutil/hwcontext.h>
} }
namespace FFmpeg { namespace FFmpeg {
@ -30,8 +32,13 @@ constexpr std::array PreferredGpuDecoders = {
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_CUDA,
AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_D3D11VA,
AV_HWDEVICE_TYPE_DXVA2, AV_HWDEVICE_TYPE_DXVA2,
AV_HWDEVICE_TYPE_D3D12VA,
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
AV_HWDEVICE_TYPE_VDPAU, AV_HWDEVICE_TYPE_VDPAU,
#elif defined(__APPLE__)
AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
#elif defined(ANDROID)
AV_HWDEVICE_TYPE_MEDIACODEC,
#elif defined(__unix__) #elif defined(__unix__)
AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_CUDA,
AV_HWDEVICE_TYPE_VAAPI, AV_HWDEVICE_TYPE_VAAPI,