From 20aed3671c94e43f087cedcb7ed5b5141478106a Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 4 Aug 2020 13:37:42 +0200
Subject: [PATCH] Added upstream fix for mozbz#1656436

---
 firefox.spec          |  7 ++++++-
 mozilla-1656436.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1656436.patch

diff --git a/firefox.spec b/firefox.spec
index 46d5937..d8a49d5 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -114,7 +114,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        79.0
-Release:        4%{?dist}
+Release:        5%{?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
@@ -184,6 +184,7 @@ Patch575:        firefox-pipewire-0-3.patch
 Patch584:        firefox-disable-ffvpx-with-vapi.patch
 Patch585:        firefox-vaapi-extra-frames.patch
 Patch586:        mozilla-1645671.patch
+Patch589:        mozilla-1656436.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -390,6 +391,7 @@ This package contains results of tests executed during build.
 %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
 %patch585 -p1 -b .firefox-vaapi-extra-frames
 %patch586 -p1 -b .mozilla-1645671
+%patch589 -p1 -b .mozilla-1656436
 
 # PGO patches
 %patch600 -p1 -b .pgo
@@ -958,6 +960,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 4 2020 Martin Stransky <stransky@redhat.com> - 79.0-5
+- Added upstream fix for mozbz#1656436.
+
 * Mon Aug 3 2020 Martin Stransky <stransky@redhat.com> - 79.0-4
 - Updated fix for mozbz#1645671
 
diff --git a/mozilla-1656436.patch b/mozilla-1656436.patch
new file mode 100644
index 0000000..6350a43
--- /dev/null
+++ b/mozilla-1656436.patch
@@ -0,0 +1,28 @@
+diff -up firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.mozilla-1656436 firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+--- firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp.mozilla-1656436	2020-08-04 13:31:49.476663242 +0200
++++ firefox-79.0/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp	2020-08-04 13:32:28.201448682 +0200
+@@ -766,6 +766,11 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER
+     mDMABufSurfaces.EmplaceBack(surface, mLib);
+     surfaceWrapper = &(mDMABufSurfaces[mDMABufSurfaces.Length() - 1]);
+   } else {
++    // Release VAAPI surface data before we reuse it.
++    if (mVAAPIDeviceContext) {
++      surfaceWrapper->ReleaseVAAPIData();
++    }
++
+     surface = surfaceWrapper->GetDMABufSurface();
+     bool ret;
+ 
+diff -up firefox-79.0/widget/gtk/DMABufSurface.cpp.mozilla-1656436 firefox-79.0/widget/gtk/DMABufSurface.cpp
+--- firefox-79.0/widget/gtk/DMABufSurface.cpp.mozilla-1656436	2020-08-04 13:31:49.477663237 +0200
++++ firefox-79.0/widget/gtk/DMABufSurface.cpp	2020-08-04 13:33:07.666230023 +0200
+@@ -744,7 +744,8 @@ bool DMABufSurfaceYUV::UpdateYUVData(con
+     return false;
+   }
+   if (mDmabufFds[0] >= 0) {
+-    ReleaseSurface();
++    NS_WARNING("DMABufSurfaceYUV is already created!");
++    return false;
+   }
+ 
+   mSurfaceFormat = gfx::SurfaceFormat::NV12;