cf91fdcf27
Following changes were made during rebase: Use gcc toolset 14 instead of 13 Fixed annocheck workaround and backported ensure kiosk mode Removed disable-vsync-for-kiosk.patch Update to 140 esr Update bundled package list Cleanup patches: - remove unused patches - fix patch versioning - rename webrtc-128.0.patch to D225034.xxxx based on the merge request Use system libraries for drm/gbm/pipewire Update patch disabling PipeWire support Backported fips patches Enable system nss Update nss versions Added fixes for rhel9 from SE Fix the system pipewire build Update to 140.1.0 Cleanup and incorporating of SE changes Fixing spec file adding av1-else-condition-add.patch fixing av1 disable patch Fixed exceptionHandler patch Update to 140.2.0 Removed bundled(cups) as long as it is not bundled Changes related to rebase-140 of rhel-9.x(9.0, 9.2, 9.4) streams owned by SE 1.Added updated nss-3.112 in the Sources and .gitignore and updated its reference inside specfile 2.Add condition to not enable system_gbm, drm, pipewire as build was failing 3.Added handling for setting bundled_nss=1 for these streams,so that it used nss bundled nspr changes related to rhel 8.x(2,4,6,8) and 7.9 version Added fixes for missing translation and gnome kiosk Update to 140.3.0 esr Resolves: RHEL-114042
67 lines
3.2 KiB
Diff
67 lines
3.2 KiB
Diff
diff -up firefox-140.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333 firefox-140.0/dom/media/mp4/MP4Demuxer.cpp
|
|
--- firefox-140.0/dom/media/mp4/MP4Demuxer.cpp.mozilla-bmo1670333 2025-06-17 18:15:13.000000000 +0200
|
|
+++ firefox-140.0/dom/media/mp4/MP4Demuxer.cpp 2025-06-18 10:17:47.394794429 +0200
|
|
@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re
|
|
DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
|
|
__func__, ##__VA_ARGS__)
|
|
|
|
+extern bool gUseKeyframeFromContainer;
|
|
+
|
|
namespace mozilla {
|
|
|
|
using TimeUnit = media::TimeUnit;
|
|
@@ -419,6 +421,12 @@ already_AddRefed<MediaRawData> MP4TrackD
|
|
case H264::FrameType::OTHER: {
|
|
bool keyframe = type == H264::FrameType::I_FRAME_OTHER ||
|
|
type == H264::FrameType::I_FRAME_IDR;
|
|
+ if (gUseKeyframeFromContainer) {
|
|
+ if (sample->mKeyframe && sample->mKeyframe != keyframe) {
|
|
+ sample->mKeyframe = keyframe;
|
|
+ }
|
|
+ break;
|
|
+ }
|
|
if (sample->mKeyframe != keyframe) {
|
|
NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
|
|
"@ pts:%" PRId64 " dur:%" PRId64
|
|
diff -up firefox-140.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333 firefox-140.0/dom/media/platforms/PDMFactory.cpp
|
|
--- firefox-140.0/dom/media/platforms/PDMFactory.cpp.mozilla-bmo1670333 2025-06-17 18:15:13.000000000 +0200
|
|
+++ firefox-140.0/dom/media/platforms/PDMFactory.cpp 2025-06-18 10:10:29.209789856 +0200
|
|
@@ -61,6 +61,8 @@
|
|
|
|
#include <functional>
|
|
|
|
+bool gUseKeyframeFromContainer = false;
|
|
+
|
|
using DecodeSupport = mozilla::media::DecodeSupport;
|
|
using DecodeSupportSet = mozilla::media::DecodeSupportSet;
|
|
using MediaCodec = mozilla::media::MediaCodec;
|
|
@@ -573,7 +575,7 @@ void PDMFactory::CreateRddPDMs() {
|
|
#ifdef MOZ_FFMPEG
|
|
if (StaticPrefs::media_ffmpeg_enabled() &&
|
|
StaticPrefs::media_rdd_ffmpeg_enabled() &&
|
|
- !StartupPDM(FFmpegRuntimeLinker::CreateDecoder())) {
|
|
+ !(mFFmpegUsed = StartupPDM(FFmpegRuntimeLinker::CreateDecoder()))) {
|
|
mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
|
|
FFmpegRuntimeLinker::LinkStatusCode());
|
|
}
|
|
@@ -749,7 +751,7 @@ void PDMFactory::CreateDefaultPDMs() {
|
|
StartupPDM(AgnosticDecoderModule::Create(),
|
|
StaticPrefs::media_prefer_non_ffvpx());
|
|
|
|
- if (StaticPrefs::media_gmp_decoder_enabled() &&
|
|
+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
|
|
!StartupPDM(GMPDecoderModule::Create(),
|
|
StaticPrefs::media_gmp_decoder_preferred())) {
|
|
mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
|
|
diff -up firefox-140.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333 firefox-140.0/dom/media/platforms/PDMFactory.h
|
|
--- firefox-140.0/dom/media/platforms/PDMFactory.h.mozilla-bmo1670333 2025-06-17 18:15:13.000000000 +0200
|
|
+++ firefox-140.0/dom/media/platforms/PDMFactory.h 2025-06-18 10:10:29.210054963 +0200
|
|
@@ -105,6 +105,7 @@ class PDMFactory final {
|
|
RefPtr<PlatformDecoderModule> mNullPDM;
|
|
|
|
DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
|
|
+ bool mFFmpegUsed = false;
|
|
|
|
friend class RemoteVideoDecoderParent;
|
|
static void EnsureInit();
|