From 2bde47610fcd4a55680f1bbf4589031fc8d7d955 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 2 Feb 2024 13:34:08 +0100
Subject: [PATCH] Update to 2.4.1

---
 .gitignore                                    |  1 +
 ...ff-by-one-regression-in-decoder-3704.patch | 29 -------------------
 openh264.spec                                 | 13 ++++-----
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 0001-Fix-off-by-one-regression-in-decoder-3704.patch

diff --git a/.gitignore b/.gitignore
index 78f8279..2d92029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /gst-plugins-bad-openh264-1.22.1.tar.xz
 /openh264-2.4.0.tar.gz
 /gmp-api-e7d30b9.tar.gz
+/openh264-2.4.1.tar.gz
diff --git a/0001-Fix-off-by-one-regression-in-decoder-3704.patch b/0001-Fix-off-by-one-regression-in-decoder-3704.patch
deleted file mode 100644
index 699281d..0000000
--- a/0001-Fix-off-by-one-regression-in-decoder-3704.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fd66e67ac6136aff80b1567488568ba1ed7e8fb8 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Mon, 4 Dec 2023 07:54:04 +0100
-Subject: [PATCH] Fix off by one regression in decoder (#3704)
-
-Fix iPicBuffIdx bounds check introduced in commit
-986bd65b711191d4883c54ace32a9879e17729c2 and allow 0 as an index value.
-
-This fixes Big_Buck_Bunny_720_10s_30MB.mp4 playback with gst-play-1.0.
----
- codec/decoder/plus/src/welsDecoderExt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp
-index 170d17de..457effb6 100644
---- a/codec/decoder/plus/src/welsDecoderExt.cpp
-+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
-@@ -1136,7 +1136,7 @@ void CWelsDecoder::ReleaseBufferedReadyPictureReorder (PWelsDecoderContext pCtx,
-       m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
-       int32_t iPicBuffIdx = m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx;
-       if (pPicBuff != NULL) {
--        if (iPicBuffIdx > 0 && iPicBuffIdx < pPicBuff->iCapacity)
-+        if (iPicBuffIdx >= 0 && iPicBuffIdx < pPicBuff->iCapacity)
-         {
-             PPicture pPic = pPicBuff->ppPic[iPicBuffIdx];
-             --pPic->iRefCount;
--- 
-2.41.0
-
diff --git a/openh264.spec b/openh264.spec
index 9b3e3c1..d12cf07 100644
--- a/openh264.spec
+++ b/openh264.spec
@@ -3,7 +3,7 @@
 %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
-%global openh264_version 2.4.0
+%global openh264_version 2.4.1
 %global gst_version 1.22.1
 
 # Filter out soname provides for the mozilla plugin
@@ -12,7 +12,7 @@
 Name:           openh264
 Version:        %{openh264_version}
 # Also bump the Release tag for gstreamer1-plugin-openh264 down below
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        H.264 codec library
 
 License:        BSD-2-Clause
@@ -25,9 +25,6 @@ Source1:        https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{
 Source2:        gst-plugins-bad-openh264-%{gst_version}.tar.xz
 Source3:        gst-p-bad-cleanup.sh
 
-# Backported from upstream
-# https://github.com/cisco/openh264/pull/3704
-Patch1:         0001-Fix-off-by-one-regression-in-decoder-3704.patch
 # Don't use pkg-config for finding openh264 as we are building against an in-tree copy
 Patch2:         hardcode-openh264-dep.patch
 
@@ -69,7 +66,7 @@ browsers.
 
 %package     -n gstreamer1-plugin-openh264
 Version:        %{gst_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GStreamer H.264 plugin
 
 %description -n gstreamer1-plugin-openh264
@@ -81,7 +78,6 @@ This package contains the H.264 plugin.
 
 %prep
 %setup -q
-%patch1 -p1
 
 # Extract gmp-api archive
 tar -xf %{S:1}
@@ -238,6 +234,9 @@ popd
 
 
 %changelog
+* Fri Feb 02 2024 Kalev Lember <klember@redhat.com> - 2.4.1-1
+- Update to 2.4.1
+
 * Mon Dec 04 2023 Kalev Lember <klember@redhat.com> - 2.4.0-2
 - Fix off by one regression in decoder
 - Filter out soname provides for mozilla gmp plugin
diff --git a/sources b/sources
index b3463e1..6ca99d9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (gmp-api-e7d30b9.tar.gz) = f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9
 SHA512 (gst-plugins-bad-openh264-1.22.1.tar.xz) = 45cfb95beb2467b35d47e312ce567a9ea01f57743d001f21dca42b7e4fa1271c431f53d2fc6862fcfbfa22f067f65ffbce9b0e3de0f05f32bd48a5292ed85e30
-SHA512 (openh264-2.4.0.tar.gz) = dc66986e84ad328e1615384e7bff93d6eaac42a68e87d9c9b59f55d9f90efd13dc87637a7e3b8c9694634dfa82351c5944828f3f478286608e362e014dd70ca1
+SHA512 (openh264-2.4.1.tar.gz) = eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf