History

Merge remote-tracking branch 'upstream/master'

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit 3eb2a132 parents a313955 c435fb914 files · +2356 −2337Browse files

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

Unified · Split

codec/decoder/core/src/parse_mb_syn_cabac.cpp+4−0
@@ -777,6 +777,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 776 unmodified lines
777 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {777 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
778 iRef[listIdx] = 0;778 iRef[listIdx] = 0;
779 pCtx->iErrorCode |= dsBitstreamError;779 pCtx->iErrorCode |= dsBitstreamError;
780 RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]]);
780 } else {781 } else {
781 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);782 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
782 }783 }
@@ -814,6 +815,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 31 unmodified lines
814 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {815 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
815 ref_idx = 0;816 ref_idx = 0;
816 pCtx->iErrorCode |= dsBitstreamError;817 pCtx->iErrorCode |= dsBitstreamError;
818 RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
817 } else {819 } else {
818 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);820 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
819 }821 }
@@ -858,6 +860,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 38 unmodified lines
858 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {860 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
859 ref_idx = 0;861 ref_idx = 0;
860 pCtx->iErrorCode |= dsBitstreamError;862 pCtx->iErrorCode |= dsBitstreamError;
863 RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
861 } else {864 } else {
862 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);865 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
863 }866 }
@@ -992,6 +995,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 128 unmodified lines
992 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {995 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
993 iref = 0;996 iref = 0;
994 pCtx->iErrorCode |= dsBitstreamError;997 pCtx->iErrorCode |= dsBitstreamError;
998 RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iref]);
995 } else {999 } else {
996 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);1000 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
997 }1001 }

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