From cd6ef2bb8265b2054523b97231f7e6daa98aaa31 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 Jun 2022 15:05:58 +0200 Subject: Added fix for mozbz#1758948 (AV1 VA-API playback shuttering) --- firefox.spec | 9 ++++++++- mozilla-1758948.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 mozilla-1758948.patch diff --git a/firefox.spec b/firefox.spec index 80f2a2d..1e7b348 100644 --- a/firefox.spec +++ b/firefox.spec @@ -163,7 +163,7 @@ ExcludeArch: aarch64 Summary: Mozilla Firefox Web browser Name: firefox Version: 101.0.1 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -267,9 +267,12 @@ Patch435: D146275.diff Patch440: D147635.diff Patch441: D147636.diff Patch442: D147637.diff + +# More upstream fixes Patch443: D149135.diff Patch444: D148946.diff Patch445: D149238.diff +Patch446: mozilla-1758948.patch # PGO/LTO patches Patch600: pgo.patch @@ -541,6 +544,7 @@ This package contains results of tests executed during build. %patch422 -p1 -b .D147720.diff %patch444 -p1 -b .D148946.diff %patch445 -p1 -b .D149238.diff +%patch446 -p1 -b .mozbz#1758948 # PGO patches %if %{build_with_pgo} @@ -1114,6 +1118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Jun 15 2022 Martin Stransky - 101.0.1-5 +- Added fix for mozbz#1758948 (AV1 VA-API playback shuttering) + * Tue Jun 14 2022 Martin Stransky - 101.0.1-3 - Added fixes for mozbz#1773377 and mozbz#1774075 diff --git a/mozilla-1758948.patch b/mozilla-1758948.patch new file mode 100644 index 0000000..7bc99e4 --- /dev/null +++ b/mozilla-1758948.patch @@ -0,0 +1,28 @@ +changeset: 623785:a6b80ee8c35f +tag: tip +parent: 623782:b1ed2fa50612 +user: stransky +date: Wed Jun 15 14:54:19 2022 +0200 +files: dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +description: +Bug 1758948 [FFmpeg] Use AVFrame::pts instead of AVFrame::pkt_pts on ffmpeg 4.x r?alwu + +AVFrame::pkt_pts has been deprecated and gives us wrong values for AV1 VA-API. Let's use AVFrame::pts instead on ffmpeg 4.x +as well as we use on ffmpeg 5.0 where AVFrame::pkt_pts is removed. + +Differential Revision: https://phabricator.services.mozilla.com/D149386 + + +diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +@@ -774,7 +774,7 @@ void FFmpegVideoDecoder::Init + #endif + + static int64_t GetFramePts(AVFrame* aFrame) { +-#if LIBAVCODEC_VERSION_MAJOR > 58 ++#if LIBAVCODEC_VERSION_MAJOR > 57 + return aFrame->pts; + #else + return aFrame->pkt_pts; + -- cgit