diff options
Diffstat (limited to 'media-libs/openh264/files')
-rw-r--r-- | media-libs/openh264/files/openh264-2.4.0-fix-off-by-one-decode-regression.patch | 26 | ||||
-rw-r--r-- | media-libs/openh264/files/openh264-2.4.0-unordered-frame-glitches.patch | 264 |
2 files changed, 290 insertions, 0 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 new file mode 100644 index 000000000000..0ef8e3dc56f2 --- /dev/null +++ b/media-libs/openh264/files/openh264-2.4.0-fix-off-by-one-decode-regression.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000000..373fac95f940 --- /dev/null +++ b/media-libs/openh264/files/openh264-2.4.0-unordered-frame-glitches.patch @@ -0,0 +1,264 @@ +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) { |