shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #810 from huili2/ps_error_logic_ec

for PS error logic for EC

--- a/codec/decoder/core/src/au_parser.cpp

+++ b/codec/decoder/core/src/au_parser.cpp

@@ -493,7 +493,8 @@

 #endif

     iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight);

     if (ERR_NONE != iErr) {	// modified for pSps/pSubsetSps invalid, 12/1/2009

-      pCtx->iErrorCode |= dsNoParamSets;

+      if (pCtx->iErrorConMethod == ERROR_CON_DISABLE)

+        pCtx->iErrorCode |= dsNoParamSets;

       return iErr;

     }

@@ -507,7 +508,8 @@

 #endif

     iErr = ParsePps (pCtx, &pCtx->sPpsBuffer[0], pBs);

     if (ERR_NONE != iErr) {	// modified for pps invalid, 12/1/2009

-      pCtx->iErrorCode |= dsNoParamSets;

+      if (pCtx->iErrorConMethod == ERROR_CON_DISABLE)

+        pCtx->iErrorCode |= dsNoParamSets;

       return iErr;

     }