diff options
Diffstat (limited to 'firefox-disable-ffvpx-with-vapi.patch')
| -rw-r--r-- | firefox-disable-ffvpx-with-vapi.patch | 60 |
1 files changed, 54 insertions, 6 deletions
diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch index 3b706b7..3ecdbed 100644 --- a/firefox-disable-ffvpx-with-vapi.patch +++ b/firefox-disable-ffvpx-with-vapi.patch @@ -1,7 +1,7 @@ -diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-87.0/dom/media/platforms/PDMFactory.cpp ---- firefox-87.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi 2021-03-22 21:31:15.466328522 +0100 -+++ firefox-87.0/dom/media/platforms/PDMFactory.cpp 2021-03-22 21:32:15.034156238 +0100 -@@ -462,12 +462,6 @@ void PDMFactory::CreateRddPDMs() { +diff -up firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox-88.0/dom/media/platforms/PDMFactory.cpp +--- firefox-88.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi 2021-04-15 21:44:28.000000000 +0200 ++++ firefox-88.0/dom/media/platforms/PDMFactory.cpp 2021-04-19 13:27:07.808429721 +0200 +@@ -481,12 +481,6 @@ void PDMFactory::CreateRddPDMs() { CreateAndStartupPDM<AppleDecoderModule>(); } #endif @@ -14,8 +14,8 @@ diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox #ifdef MOZ_FFMPEG if (StaticPrefs::media_ffmpeg_enabled() && StaticPrefs::media_rdd_ffmpeg_enabled() && -@@ -477,6 +471,12 @@ void PDMFactory::CreateRddPDMs() { - mFailureFlags -= DecoderDoctorDiagnostics::Flags::FFmpegFailedToLoad; +@@ -495,6 +489,12 @@ void PDMFactory::CreateRddPDMs() { + FFmpegRuntimeLinker::LinkStatusCode()); } #endif +#ifdef MOZ_FFVPX @@ -27,3 +27,51 @@ diff -up firefox-87.0/dom/media/platforms/PDMFactory.cpp.ffvpx-with-vapi firefox CreateAndStartupPDM<AgnosticDecoderModule>(); } +@@ -525,11 +525,6 @@ void PDMFactory::CreateContentPDMs() { + CreateAndStartupPDM<OmxDecoderModule>(); + } + #endif +-#ifdef MOZ_FFVPX +- if (StaticPrefs::media_ffvpx_enabled()) { +- CreateAndStartupPDM<FFVPXRuntimeLinker>(); +- } +-#endif + #ifdef MOZ_FFMPEG + if (StaticPrefs::media_ffmpeg_enabled() && + !CreateAndStartupPDM<FFmpegRuntimeLinker>()) { +@@ -537,6 +532,11 @@ void PDMFactory::CreateContentPDMs() { + FFmpegRuntimeLinker::LinkStatusCode()); + } + #endif ++#ifdef MOZ_FFVPX ++ if (StaticPrefs::media_ffvpx_enabled()) { ++ CreateAndStartupPDM<FFVPXRuntimeLinker>(); ++ } ++#endif + #ifdef MOZ_WIDGET_ANDROID + if (StaticPrefs::media_android_media_codec_enabled()) { + StartupPDM(AndroidDecoderModule::Create(), +@@ -571,11 +571,6 @@ void PDMFactory::CreateDefaultPDMs() { + CreateAndStartupPDM<OmxDecoderModule>(); + } + #endif +-#ifdef MOZ_FFVPX +- if (StaticPrefs::media_ffvpx_enabled()) { +- CreateAndStartupPDM<FFVPXRuntimeLinker>(); +- } +-#endif + #ifdef MOZ_FFMPEG + if (StaticPrefs::media_ffmpeg_enabled() && + !CreateAndStartupPDM<FFmpegRuntimeLinker>()) { +@@ -583,6 +578,11 @@ void PDMFactory::CreateDefaultPDMs() { + FFmpegRuntimeLinker::LinkStatusCode()); + } + #endif ++#ifdef MOZ_FFVPX ++ if (StaticPrefs::media_ffvpx_enabled()) { ++ CreateAndStartupPDM<FFVPXRuntimeLinker>(); ++ } ++#endif + #ifdef MOZ_WIDGET_ANDROID + if (StaticPrefs::media_android_media_codec_enabled()) { + StartupPDM(AndroidDecoderModule::Create(), |