* [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/
@ 2018-01-17 14:55 Ian Stakenvicius
0 siblings, 0 replies; 3+ messages in thread
From: Ian Stakenvicius @ 2018-01-17 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 5eafe0b025a9346b0246ef58e4045c9de3792313
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan 17 10:41:45 2018 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 14:55:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eafe0b0
media-libs/openh264: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/6890
.../files/openh264-1.5.0-pkgconfig-pathfix.patch | 40 ----------------------
media-libs/openh264/files/pkgconfig-pathfix.patch | 40 ----------------------
media-libs/openh264/files/pkgconfig_install.patch | 15 --------
3 files changed, 95 deletions(-)
diff --git a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
deleted file mode 100644
index a39823aeee7..00000000000
--- a/media-libs/openh264/files/openh264-1.5.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile 2015-10-19 21:49:05.000000000 -0400
-+++ b/Makefile 2016-02-17 12:16:06.102945631 -0500
-@@ -27,6 +27,7 @@
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -244,14 +245,14 @@
- endif
-
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-
- install-headers:
-- mkdir -p $(DESTDIR)$(PREFIX)/include/wels
-- install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+ mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
-+ install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
-
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
---- a/openh264.pc.in 2015-10-19 21:49:05.000000000 -0400
-+++ b/openh264.pc.in 2016-02-17 12:17:03.792768147 -0500
-@@ -1,6 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=@sharedlibdir@
-+includedir=@includesdir@
-
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/files/pkgconfig-pathfix.patch b/media-libs/openh264/files/pkgconfig-pathfix.patch
deleted file mode 100644
index 455b91331df..00000000000
--- a/media-libs/openh264/files/pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile 2015-03-25 03:43:00.000000000 -0400
-+++ b/Makefile 2015-06-18 17:28:42.436110085 -0400
-@@ -24,6 +24,7 @@
- OBJ=o
- DESTDIR=
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox38
-@@ -229,14 +230,14 @@
- endif
-
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
-
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@sharedlibdir@;;' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
-
- install-headers:
-- mkdir -p $(DESTDIR)/$(PREFIX)/include/wels
-- install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
-+ mkdir -p $(DESTDIR)/$(INCLUDES_DIR)/wels
-+ install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(INCLUDES_DIR)/wels
-
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- mkdir -p $(DESTDIR)/$(PREFIX)/lib
---- a/openh264.pc.in 2015-06-18 17:32:58.356114757 -0400
-+++ b/openh264.pc.in 2015-06-18 17:31:12.096112817 -0400
-@@ -1,6 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
--includedir=${prefix}/include
-+libdir=@sharedlibdir@
-+includedir=@includesdir@
-
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
diff --git a/media-libs/openh264/files/pkgconfig_install.patch b/media-libs/openh264/files/pkgconfig_install.patch
deleted file mode 100644
index 50d8715ce6f..00000000000
--- a/media-libs/openh264/files/pkgconfig_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: openh264-1.4.0/Makefile
-===================================================================
---- openh264-1.4.0.orig/Makefile
-+++ openh264-1.4.0/Makefile
-@@ -253,8 +253,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NA
- if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \
- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)/$(SHAREDLIB_DIR); \
- fi
-- mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-- install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
-+ mkdir -p $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
-+ install -m 644 $(PROJECT_NAME).pc $(DESTDIR)/$(SHAREDLIB_DIR)/pkgconfig
- ifneq ($(EXTRA_LIBRARY),)
- install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)/$(PREFIX)/lib
- endif
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/
@ 2022-09-12 17:26 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-09-12 17:26 UTC (permalink / raw
To: gentoo-commits
commit: 54100a4ded848d62d925c09824c5143f31da60ea
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 12 17:22:50 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:25:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54100a4d
media-libs/openh264: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27232
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/openh264-2.1.0-pkgconfig-pathfix.patch | 43 ----------------------
1 file changed, 43 deletions(-)
diff --git a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch b/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
deleted file mode 100644
index 275322a01906..000000000000
--- a/media-libs/openh264/files/openh264-2.1.0-pkgconfig-pathfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bf398d7..c72b024 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,6 +27,7 @@ OBJ=o
- DESTDIR=
- LIBDIR_NAME=lib
- SHAREDLIB_DIR=$(PREFIX)/lib
-+INCLUDES_DIR=$(PREFIX)/include
- PROJECT_NAME=openh264
- MODULE_NAME=gmpopenh264
- GMP_API_BRANCH=Firefox39
-@@ -285,14 +286,14 @@ endif
- endif
-
- $(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-
- $(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
-- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(PREFIX)/lib;' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@libdir@;$(SHAREDLIB_DIR);' -e 's;@includesdir@;$(INCLUDES_DIR);' -e 's;@VERSION@;$(FULL_VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
-
- install-headers:
-- mkdir -p $(DESTDIR)$(PREFIX)/include/wels
-- install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels
-+ mkdir -p $(DESTDIR)$(INCLUDES_DIR)/wels
-+ install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(INCLUDES_DIR)/wels
-
- install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
- mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)
-diff --git a/openh264.pc.in b/openh264.pc.in
-index f86225c..bee78bc 100644
---- a/openh264.pc.in
-+++ b/openh264.pc.in
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- libdir=@libdir@
--includedir=${prefix}/include
-+includedir=@includesdir@
-
- Name: OpenH264
- Description: OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: c2e2a10f5a6b6be3c20540451a0a70f775ebc32f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:10:20 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e2a10f
media-libs/openh264: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...64-2.4.0-fix-off-by-one-decode-regression.patch | 26 --
.../openh264-2.4.0-unordered-frame-glitches.patch | 264 ---------------------
2 files changed, 290 deletions(-)
diff --git a/media-libs/openh264/files/openh264-2.4.0-fix-off-by-one-decode-regression.patch b/media-libs/openh264/files/openh264-2.4.0-fix-off-by-one-decode-regression.patch
deleted file mode 100644
index 0ef8e3dc56f2..000000000000
--- a/media-libs/openh264/files/openh264-2.4.0-fix-off-by-one-decode-regression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ff7cc30b59bea581b3a9455009cc0deb67fee98c Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember@redhat.com>
-Date: Wed, 29 Nov 2023 13:40:53 +0100
-Subject: [PATCH] Fix off by one regression in decoder
-
-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 170d17dec..457effb68 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;
diff --git a/media-libs/openh264/files/openh264-2.4.0-unordered-frame-glitches.patch b/media-libs/openh264/files/openh264-2.4.0-unordered-frame-glitches.patch
deleted file mode 100644
index 373fac95f940..000000000000
--- a/media-libs/openh264/files/openh264-2.4.0-unordered-frame-glitches.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 56d3ec4c7bfdc545a840512a8f2c72545889c538 Mon Sep 17 00:00:00 2001
-From: Takashi Yano <takashi.yano@nifty.ne.jp>
-Date: Tue, 5 Dec 2023 21:48:40 +0900
-Subject: [PATCH 1/3] Add missing iLastWrittenPOC setting in unbuffered
- reordering.
-
-In CWelsDecoder::ReorderPicturesInDisplay(), iLastWrittenPOC was
-not set in unbuffered-reordering case. Due to this problem, it
-sometimes reordered the frames incorrectly. This patch fixes the
-issue.
----
- codec/decoder/plus/src/welsDecoderExt.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp
-index 457effb68..a1b26c2cb 100644
---- a/codec/decoder/plus/src/welsDecoderExt.cpp
-+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
-@@ -1206,6 +1206,7 @@ DECODING_STATE CWelsDecoder::ReorderPicturesInDisplay(PWelsDecoderContext pDecCo
- if (pDstInfo->iBufferStatus == 1) {
- if (m_sReoderingStatus.iLastGOPRemainPicts == 0 && pDecContext->pSliceHeader->eSliceType == B_SLICE &&
- pDecContext->pSliceHeader->iPicOrderCntLsb <= m_sReoderingStatus.iLastWrittenPOC + 2) {
-+ m_sReoderingStatus.iLastWrittenPOC = pDecContext->pSliceHeader->iPicOrderCntLsb;
- //issue #3478, use b-slice type to determine correct picture order as the first priority as POC order is not as reliable as based on b-slice
- ppDst[0] = pDstInfo->pDst[0];
- ppDst[1] = pDstInfo->pDst[1];
-
-From 10d0998a966dc98ba1a93122f214c2aef5bcd33f Mon Sep 17 00:00:00 2001
-From: Takashi Yano <takashi.yano@nifty.ne.jp>
-Date: Wed, 6 Dec 2023 02:08:19 +0900
-Subject: [PATCH 2/3] Prevent frame buffer from overwrite at GOP change.
-
-When bNewSeqBegin got true, iRefCount was forcibly reset even if the
-buffer was still used for reordering. Due to this problem, the buffer
-in use was sometimes overwritten with newly decoded frame. This commit
-is for fixing that problem.
----
- codec/decoder/core/src/manage_dec_ref.cpp | 37 ++++++++++++-----------
- codec/decoder/plus/src/welsDecoderExt.cpp | 4 +++
- 2 files changed, 24 insertions(+), 17 deletions(-)
-
-diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp
-index 88099b60e..c3c983129 100644
---- a/codec/decoder/core/src/manage_dec_ref.cpp
-+++ b/codec/decoder/core/src/manage_dec_ref.cpp
-@@ -66,8 +66,10 @@ int32_t GetLTRFrameIndex (PRefPic pRefPic, int32_t iAncLTRFrameNum);
- #endif
- static int32_t RemainOneBufferInDpbForEC (PWelsDecoderContext pCtx, PRefPic pRefPic);
-
--static void SetUnRef (PPicture pRef) {
-- if (NULL != pRef) {
-+static void SetUnRef (PPicture pRef, bool bNewSeqBegin) {
-+ if (pRef == NULL) return;
-+
-+ if (pRef->iRefCount <= 0 && (!pRef->bUsedAsRef || bNewSeqBegin)) {
- pRef->bUsedAsRef = false;
- pRef->bIsLongRef = false;
- pRef->iFrameNum = -1;
-@@ -81,17 +83,18 @@ static void SetUnRef (PPicture pRef) {
- pRef->iSpsId = -1;
- pRef->bIsComplete = false;
- pRef->iRefCount = 0;
-+ }
-
-- if (pRef->eSliceType == I_SLICE) {
-- return;
-- }
-- int32_t lists = pRef->eSliceType == P_SLICE ? 1 : 2;
-- for (int32_t i = 0; i < MAX_DPB_COUNT; ++i) {
-- for (int32_t list = 0; list < lists; ++list) {
-- if (pRef->pRefPic[list][i] != NULL) {
-- pRef->pRefPic[list][i]->iRefCount = 0;
-- pRef->pRefPic[list][i] = NULL;
-- }
-+ if (pRef->eSliceType == I_SLICE) {
-+ return;
-+ }
-+ int32_t lists = pRef->eSliceType == P_SLICE ? 1 : 2;
-+ for (int32_t i = 0; i < MAX_DPB_COUNT; ++i) {
-+ for (int32_t list = 0; list < lists; ++list) {
-+ if (pRef->pRefPic[list][i] != NULL) {
-+ if (pRef->pRefPic[list][i]->iRefCount > 0) continue;
-+ pRef->pRefPic[list][i]->iRefCount = 0;
-+ pRef->pRefPic[list][i] = NULL;
- }
- }
- }
-@@ -111,7 +114,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
-
- for (i = 0; i < MAX_DPB_COUNT; i++) {
- if (pRefPic->pShortRefList[LIST_0][i] != NULL) {
-- SetUnRef (pRefPic->pShortRefList[LIST_0][i]);
-+ SetUnRef (pRefPic->pShortRefList[LIST_0][i], pCtx->bNewSeqBegin);
- pRefPic->pShortRefList[LIST_0][i] = NULL;
- }
- }
-@@ -119,7 +122,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
-
- for (i = 0; i < MAX_DPB_COUNT; i++) {
- if (pRefPic->pLongRefList[LIST_0][i] != NULL) {
-- SetUnRef (pRefPic->pLongRefList[LIST_0][i]);
-+ SetUnRef (pRefPic->pLongRefList[LIST_0][i], pCtx->bNewSeqBegin);
- pRefPic->pLongRefList[LIST_0][i] = NULL;
- }
- }
-@@ -767,7 +770,7 @@ static int32_t SlidingWindow (PWelsDecoderContext pCtx, PRefPic pRefPic) {
- for (i = pRefPic->uiShortRefCount[LIST_0] - 1; i >= 0; i--) {
- pPic = WelsDelShortFromList (pRefPic, pRefPic->pShortRefList[LIST_0][i]->iFrameNum);
- if (pPic) {
-- SetUnRef (pPic);
-+ SetUnRef (pPic, pCtx->bNewSeqBegin);
- break;
- } else {
- return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
-@@ -803,7 +806,7 @@ static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum) {
- static PPicture WelsDelShortFromListSetUnref (PRefPic pRefPic, int32_t iFrameNum) {
- PPicture pPic = WelsDelShortFromList (pRefPic, iFrameNum);
- if (pPic) {
-- SetUnRef (pPic);
-+ SetUnRef (pPic, false);
- }
- return pPic;
- }
-@@ -832,7 +835,7 @@ static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameId
- static PPicture WelsDelLongFromListSetUnref (PRefPic pRefPic, uint32_t uiLongTermFrameIdx) {
- PPicture pPic = WelsDelLongFromList (pRefPic, uiLongTermFrameIdx);
- if (pPic) {
-- SetUnRef (pPic);
-+ SetUnRef (pPic, false);
- }
- return pPic;
- }
-diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp
-index a1b26c2cb..14257afff 100644
---- a/codec/decoder/plus/src/welsDecoderExt.cpp
-+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
-@@ -1084,6 +1084,8 @@ void CWelsDecoder::ReleaseBufferedReadyPictureReorder (PWelsDecoderContext pCtx,
- if (pPicBuff != NULL) {
- PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
- --pPic->iRefCount;
-+ if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP)
-+ pPic->bUsedAsRef = false;
- }
- m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
- m_sReoderingStatus.iMinPOC = IMinInt32;
-@@ -1187,6 +1189,8 @@ void CWelsDecoder::ReleaseBufferedReadyPictureNoReorder(PWelsDecoderContext pCtx
- PPicBuff pPicBuff = pCtx ? pCtx->pPicBuff : m_pPicBuff;
- PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
- --pPic->iRefCount;
-+ if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP)
-+ pPic->bUsedAsRef = false;
- }
- if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP) {
- --m_sReoderingStatus.iLastGOPRemainPicts;
-
-From f82abc09a3e7d723e21a06ec7e5f38afc218357f Mon Sep 17 00:00:00 2001
-From: Takashi Yano <takashi.yano@nifty.ne.jp>
-Date: Tue, 12 Dec 2023 19:23:32 +0900
-Subject: [PATCH 3/3] Fix test failure due to the issue of the previous commit.
-
----
- codec/decoder/core/src/manage_dec_ref.cpp | 14 +++++++-------
- codec/decoder/plus/src/welsDecoderExt.cpp | 9 +++++++--
- 2 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp
-index c3c983129..410b9c47f 100644
---- a/codec/decoder/core/src/manage_dec_ref.cpp
-+++ b/codec/decoder/core/src/manage_dec_ref.cpp
-@@ -66,10 +66,10 @@ int32_t GetLTRFrameIndex (PRefPic pRefPic, int32_t iAncLTRFrameNum);
- #endif
- static int32_t RemainOneBufferInDpbForEC (PWelsDecoderContext pCtx, PRefPic pRefPic);
-
--static void SetUnRef (PPicture pRef, bool bNewSeqBegin) {
-+static void SetUnRef (PPicture pRef) {
- if (pRef == NULL) return;
-
-- if (pRef->iRefCount <= 0 && (!pRef->bUsedAsRef || bNewSeqBegin)) {
-+ if (pRef->iRefCount <= 0) {
- pRef->bUsedAsRef = false;
- pRef->bIsLongRef = false;
- pRef->iFrameNum = -1;
-@@ -114,7 +114,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
-
- for (i = 0; i < MAX_DPB_COUNT; i++) {
- if (pRefPic->pShortRefList[LIST_0][i] != NULL) {
-- SetUnRef (pRefPic->pShortRefList[LIST_0][i], pCtx->bNewSeqBegin);
-+ SetUnRef (pRefPic->pShortRefList[LIST_0][i]);
- pRefPic->pShortRefList[LIST_0][i] = NULL;
- }
- }
-@@ -122,7 +122,7 @@ void WelsResetRefPic (PWelsDecoderContext pCtx) {
-
- for (i = 0; i < MAX_DPB_COUNT; i++) {
- if (pRefPic->pLongRefList[LIST_0][i] != NULL) {
-- SetUnRef (pRefPic->pLongRefList[LIST_0][i], pCtx->bNewSeqBegin);
-+ SetUnRef (pRefPic->pLongRefList[LIST_0][i]);
- pRefPic->pLongRefList[LIST_0][i] = NULL;
- }
- }
-@@ -770,7 +770,7 @@ static int32_t SlidingWindow (PWelsDecoderContext pCtx, PRefPic pRefPic) {
- for (i = pRefPic->uiShortRefCount[LIST_0] - 1; i >= 0; i--) {
- pPic = WelsDelShortFromList (pRefPic, pRefPic->pShortRefList[LIST_0][i]->iFrameNum);
- if (pPic) {
-- SetUnRef (pPic, pCtx->bNewSeqBegin);
-+ SetUnRef (pPic);
- break;
- } else {
- return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
-@@ -806,7 +806,7 @@ static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum) {
- static PPicture WelsDelShortFromListSetUnref (PRefPic pRefPic, int32_t iFrameNum) {
- PPicture pPic = WelsDelShortFromList (pRefPic, iFrameNum);
- if (pPic) {
-- SetUnRef (pPic, false);
-+ SetUnRef (pPic);
- }
- return pPic;
- }
-@@ -835,7 +835,7 @@ static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameId
- static PPicture WelsDelLongFromListSetUnref (PRefPic pRefPic, uint32_t uiLongTermFrameIdx) {
- PPicture pPic = WelsDelLongFromList (pRefPic, uiLongTermFrameIdx);
- if (pPic) {
-- SetUnRef (pPic, false);
-+ SetUnRef (pPic);
- }
- return pPic;
- }
-diff --git a/codec/decoder/plus/src/welsDecoderExt.cpp b/codec/decoder/plus/src/welsDecoderExt.cpp
-index 14257afff..b0936a7d8 100644
---- a/codec/decoder/plus/src/welsDecoderExt.cpp
-+++ b/codec/decoder/plus/src/welsDecoderExt.cpp
-@@ -1083,8 +1083,9 @@ void CWelsDecoder::ReleaseBufferedReadyPictureReorder (PWelsDecoderContext pCtx,
- m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
- if (pPicBuff != NULL) {
- PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
-+ bool bLastGOP = m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP;
- --pPic->iRefCount;
-- if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP)
-+ if (pPic->iRefCount <= 0 && bLastGOP)
- pPic->bUsedAsRef = false;
- }
- m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
-@@ -1141,7 +1142,10 @@ void CWelsDecoder::ReleaseBufferedReadyPictureReorder (PWelsDecoderContext pCtx,
- if (iPicBuffIdx >= 0 && iPicBuffIdx < pPicBuff->iCapacity)
- {
- PPicture pPic = pPicBuff->ppPic[iPicBuffIdx];
-+ bool bLastGOP = m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP;
- --pPic->iRefCount;
-+ if (pPic->iRefCount <= 0 && bLastGOP)
-+ pPic->bUsedAsRef = false;
- }
- }
- m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
-@@ -1188,8 +1192,9 @@ void CWelsDecoder::ReleaseBufferedReadyPictureNoReorder(PWelsDecoderContext pCtx
- if (pCtx || m_pPicBuff) {
- PPicBuff pPicBuff = pCtx ? pCtx->pPicBuff : m_pPicBuff;
- PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
-+ bool bLastGOP = m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP;
- --pPic->iRefCount;
-- if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP)
-+ if (pPic->iRefCount <= 0 && bLastGOP)
- pPic->bUsedAsRef = false;
- }
- if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-18 19:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-18 19:32 [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2022-09-12 17:26 Joonas Niilola
2018-01-17 14:55 Ian Stakenvicius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox