Fix Bugzilla reported bug 1522172_2 (second test case) and 1535089.

xiaotiansf committed 7 years ago

Commit ea99af81 parent a1406d52 files · +5 −1Browse files

Showing the changes to codec/decoder (2 of 2 files). Show all

Unified · Split

2 files

codec/decoder/core/src/manage_dec_ref.cpp +4 −0
codec/decoder/plus/src/welsDecoderExt.cpp +1 −1

codec/decoder/core/src/manage_dec_ref.cpp+4−0

@@ -79,6 +79,10 @@ static void SetUnRef (PPicture pRef) { · 78 unmodified lines
79	79	pRef->uiSpatialId = -1;
80	80	pRef->iSpsId = -1;
81	81	pRef->bIsComplete = false;
	82	+ for (int32_t i = 0; i < MAX_DPB_COUNT; ++i) {
	83	+ pRef->pRefPic[LIST_0][i] = NULL;
	84	+ pRef->pRefPic[LIST_1][i] = NULL;
	85	+ }
82	86	}
83	87	}
84	88

codec/decoder/plus/src/welsDecoderExt.cpp+1−1

@@ -583,7 +583,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 582 unmodified lines
583	583
584	584	if ((m_pDecContext->iErrorCode & dsRefLost) && m_pDecContext->eSliceType == B_SLICE) {
585	585	if (ResetDecoder())
586		− return dsOutOfMemory;
	586	+ return dsRefLost;
587	587
588	588	return dsErrorFree;
589	589	}