Fix a bug where ISVCDecoder::DecodeFrameNoDelay() could fail when decoding an H.264 stream encoded by the Apple HWA encoder. (#3787)

sile · web-flow · commit f70c905b8242 · 2024-10-10T14:02:38.000+08:00
* Fix to use `max_num_ref_frames` to check `max_long_term_frame_idx_plus1` value

* Remove unnecessary cast
diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp
@@ -544,7 +544,7 @@ int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSli
           bMmco4Exist = true;
           WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //max_long_term_frame_idx_plus1
           int32_t iMaxLongTermFrameIdx = -1 + uiCode;
-          if (iMaxLongTermFrameIdx > int32_t (pSps->uiLog2MaxFrameNum)) {
+          if (iMaxLongTermFrameIdx > pSps->iNumRefFrames) {
             //ISO/IEC 14496-10:2009(E) 7.4.3.3 Decoded reference picture marking semantics page 96
             return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_MARKING);
           }

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,7 @@ int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSli`
`544`	`544`	`bMmco4Exist = true;`
`545`	`545`	`WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //max_long_term_frame_idx_plus1`
`546`	`546`	`int32_t iMaxLongTermFrameIdx = -1 + uiCode;`
`547`		`- if (iMaxLongTermFrameIdx > int32_t (pSps->uiLog2MaxFrameNum)) {`
	`547`	`+ if (iMaxLongTermFrameIdx > pSps->iNumRefFrames) {`
`548`	`548`	`//ISO/IEC 14496-10:2009(E) 7.4.3.3 Decoded reference picture marking semantics page 96`
`549`	`549`	`return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_MARKING);`
`550`	`550`	`}`