|
 |
5f59976 |
diff -up firefox-86.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-86.0/dom/media/mp4/MP4Demuxer.cpp
|
|
|
5f59976 |
--- firefox-86.0/dom/media/mp4/MP4Demuxer.cpp.1670333 2021-02-22 14:43:37.000000000 +0100
|
|
|
5f59976 |
+++ firefox-86.0/dom/media/mp4/MP4Demuxer.cpp 2021-02-23 17:59:14.824346217 +0100
|
|
|
8e33654 |
@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { re
|
|
|
8e33654 |
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
|
|
|
8e33654 |
__func__, ##__VA_ARGS__)
|
|
|
8e33654 |
|
|
|
8e33654 |
+extern bool gUseKeyframeFromContainer;
|
|
|
8e33654 |
+
|
|
|
8e33654 |
namespace mozilla {
|
|
|
8e33654 |
|
|
|
8e33654 |
DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
|
|
|
8e33654 |
@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData> MP4TrackD
|
|
|
39ad1cc |
[[fallthrough]];
|
|
|
39ad1cc |
case H264::FrameType::OTHER: {
|
|
|
39ad1cc |
bool keyframe = type == H264::FrameType::I_FRAME;
|
|
|
8e33654 |
+ if (gUseKeyframeFromContainer) {
|
|
|
8e33654 |
+ if (sample->mKeyframe && sample->mKeyframe != keyframe) {
|
|
|
8e33654 |
+ sample->mKeyframe = keyframe;
|
|
|
8e33654 |
+ }
|
|
|
8e33654 |
+ break;
|
|
|
8e33654 |
+ }
|
|
|
8e33654 |
if (sample->mKeyframe != keyframe) {
|
|
|
39ad1cc |
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
|
|
|
39ad1cc |
"@ pts:%" PRId64 " dur:%" PRId64
|
|
|
5f59976 |
diff -up firefox-86.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-86.0/dom/media/platforms/PDMFactory.cpp
|
|
|
5f59976 |
--- firefox-86.0/dom/media/platforms/PDMFactory.cpp.1670333 2021-02-22 15:47:05.000000000 +0100
|
|
|
5f59976 |
+++ firefox-86.0/dom/media/platforms/PDMFactory.cpp 2021-02-23 18:01:08.124715733 +0100
|
|
|
5f59976 |
@@ -59,6 +59,8 @@
|
|
|
8e33654 |
|
|
|
8e33654 |
#include <functional>
|
|
|
8e33654 |
|
|
|
8e33654 |
+bool gUseKeyframeFromContainer = false;
|
|
|
8e33654 |
+
|
|
|
8e33654 |
namespace mozilla {
|
|
|
8e33654 |
|
|
|
5f59976 |
extern already_AddRefed<PlatformDecoderModule> CreateNullDecoderModule();
|
|
|
5f59976 |
@@ -537,9 +539,11 @@ void PDMFactory::CreateDefaultPDMs() {
|
|
|
feba2cc |
}
|
|
|
feba2cc |
#endif
|
|
|
8e33654 |
#ifdef MOZ_FFMPEG
|
|
|
feba2cc |
- if (StaticPrefs::media_ffmpeg_enabled() &&
|
|
|
feba2cc |
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
|
|
|
feba2cc |
- mFailureFlags += DecoderDoctorDiagnostics::Flags::FFmpegFailedToLoad;
|
|
|
feba2cc |
+ if (StaticPrefs::media_ffmpeg_enabled()) {
|
|
|
feba2cc |
+ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
|
|
|
feba2cc |
+ if (!mFFmpegUsed) {
|
|
|
feba2cc |
+ mFailureFlags += DecoderDoctorDiagnostics::Flags::FFmpegFailedToLoad;
|
|
|
feba2cc |
+ }
|
|
|
8e33654 |
}
|
|
|
feba2cc |
#endif
|
|
|
feba2cc |
#ifdef MOZ_WIDGET_ANDROID
|
|
|
5f59976 |
@@ -551,8 +555,9 @@ void PDMFactory::CreateDefaultPDMs() {
|
|
|
feba2cc |
|
|
|
feba2cc |
CreateAndStartupPDM<AgnosticDecoderModule>();
|
|
|
8e33654 |
|
|
|
feba2cc |
- if (StaticPrefs::media_gmp_decoder_enabled() &&
|
|
|
feba2cc |
+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
|
|
|
feba2cc |
!CreateAndStartupPDM<GMPDecoderModule>()) {
|
|
|
8e33654 |
+ gUseKeyframeFromContainer = true;
|
|
|
feba2cc |
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
|
|
|
feba2cc |
}
|
|
|
feba2cc |
}
|
|
|
5f59976 |
diff -up firefox-86.0/dom/media/platforms/PDMFactory.h.1670333 firefox-86.0/dom/media/platforms/PDMFactory.h
|
|
|
5f59976 |
--- firefox-86.0/dom/media/platforms/PDMFactory.h.1670333 2021-02-22 15:47:05.000000000 +0100
|
|
|
5f59976 |
+++ firefox-86.0/dom/media/platforms/PDMFactory.h 2021-02-23 17:59:14.824346217 +0100
|
|
|
5f59976 |
@@ -125,6 +125,8 @@ class PDMFactory final {
|
|
|
8e33654 |
|
|
|
feba2cc |
DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
|
|
|
8e33654 |
|
|
|
feba2cc |
+ bool mFFmpegUsed = false;
|
|
|
feba2cc |
+
|
|
|
8e33654 |
friend class RemoteVideoDecoderParent;
|
|
|
feba2cc |
static void EnsureInit();
|
|
|
feba2cc |
template <class T>
|