History

Merge pull request #1025 from huili2/EC_return_error

add return error if data lost

dongzha committed 12 years ago

Commit f8ca91f2 parents 300bbfb b55f1bd2 files · +3 −0Browse files

Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 2 files). Show all

Unified · Split

codec/decoder/core/src/decoder_core.cpp+2−0
@@ -1944,6 +1944,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 1943 unmodified lines
1944 if (NeedErrorCon (pCtx)) {1944 if (NeedErrorCon (pCtx)) {
1945 ImplementErrorCon (pCtx);1945 ImplementErrorCon (pCtx);
1946 pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;1946 pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
1947 pCtx->iErrorCode |= dsDataErrorConcealed;
1947 }1948 }
1948 }1949 }
1949 1950
@@ -1993,6 +1994,7 @@ bool CheckAndDoEC (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstI · 43 unmodified lines
1993 pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num1994 pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num
1994 if (pCtx->bLastHasMmco5)1995 if (pCtx->bLastHasMmco5)
1995 pCtx->iPrevFrameNum = 0;1996 pCtx->iPrevFrameNum = 0;
1997 pCtx->iErrorCode |= dsDataErrorConcealed;
1996 }1998 }
1997 }1999 }
1998 return ERR_NONE;2000 return ERR_NONE;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t