generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reuse dsNoParamSets in dec

Browse Source
This commit is contained in:
huili2 2014-07-14 18:47:40 -07:00
parent 2791929e03
commit c4fc6642cf
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/decoder/core/src/au_parser.cpp
View File

@ -508,6 +508,8 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t
if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009 if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009
if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) if (pCtx->iErrorConMethod == ERROR_CON_DISABLE)
pCtx->iErrorCode |= dsNoParamSets; pCtx->iErrorCode |= dsNoParamSets;
else
pCtx->iErrorCode |= dsBitstreamError;
return iErr; return iErr;
} }
@ -520,6 +522,8 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t
if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009 if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009
if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) if (pCtx->iErrorConMethod == ERROR_CON_DISABLE)
pCtx->iErrorCode |= dsNoParamSets; pCtx->iErrorCode |= dsNoParamSets;
else
pCtx->iErrorCode |= dsBitstreamError;
return iErr; return iErr;
} }

12
codec/decoder/core/src/decoder.cpp
View File

@ -474,7 +474,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
#else #else
pCtx->bReferenceLostAtT0Flag = true; pCtx->bReferenceLostAtT0Flag = true;
#endif #endif
ResetParameterSetsState (pCtx); if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
ResetParameterSetsState (pCtx);
if (dsOutOfMemory & pCtx->iErrorCode) { if (dsOutOfMemory & pCtx->iErrorCode) {
return pCtx->iErrorCode; return pCtx->iErrorCode;
@ -489,7 +490,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
#else #else
pCtx->bReferenceLostAtT0Flag = true; pCtx->bReferenceLostAtT0Flag = true;
#endif #endif
ResetParameterSetsState (pCtx); if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
ResetParameterSetsState (pCtx);
} }
return pCtx->iErrorCode; return pCtx->iErrorCode;
} }
@ -532,7 +534,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
#else #else
pCtx->bReferenceLostAtT0Flag = true; pCtx->bReferenceLostAtT0Flag = true;
#endif #endif
ResetParameterSetsState (pCtx); if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
ResetParameterSetsState (pCtx);
return pCtx->iErrorCode; return pCtx->iErrorCode;
} }
} }
@ -567,7 +570,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in
#else #else
pCtx->bReferenceLostAtT0Flag = true; pCtx->bReferenceLostAtT0Flag = true;
#endif #endif
ResetParameterSetsState (pCtx); if ((pCtx->iErrorConMethod == ERROR_CON_DISABLE) || (dsOutOfMemory & pCtx->iErrorCode))
ResetParameterSetsState (pCtx);
return pCtx->iErrorCode; return pCtx->iErrorCode;
} }
} }