Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 13 files). Show all
Unified · Split
| @@ -103,7 +103,7 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t · 102 unmodified lines | |||
| 103 | ppDst[2] = ppDst[2] + pCtx->sFrameCrop.iTopOffset * pPic->iLinesize[1] + pCtx->sFrameCrop.iLeftOffset; | 103 | ppDst[2] = ppDst[2] + pCtx->sFrameCrop.iTopOffset * pPic->iLinesize[1] + pCtx->sFrameCrop.iLeftOffset; |
| 104 | pDstInfo->iBufferStatus = 1; | 104 | pDstInfo->iBufferStatus = 1; |
| 105 | 105 | ||
| 106 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) //no buffer output if EC is disabled and frame incomplete | 106 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) //no buffer output if EC is disabled and frame incomplete |
| 107 | pDstInfo->iBufferStatus = (int32_t) bFrameCompleteFlag; | 107 | pDstInfo->iBufferStatus = (int32_t) bFrameCompleteFlag; |
| 108 | 108 | ||
| 109 | if (!bFrameCompleteFlag) { | 109 | if (!bFrameCompleteFlag) { |
| @@ -129,7 +129,7 @@ inline void HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal · 19 unmodified lines | |||
| 129 | if (0 == pCurNal->sNalHeaderExt.uiTemporalId) { | 129 | if (0 == pCurNal->sNalHeaderExt.uiTemporalId) { |
| 130 | pCtx->bReferenceLostAtT0Flag = true; | 130 | pCtx->bReferenceLostAtT0Flag = true; |
| 131 | } | 131 | } |
| 132 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 132 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 133 | #ifndef LONG_TERM_REF | 133 | #ifndef LONG_TERM_REF |
| 134 | if (pCtx->bReferenceLostAtT0Flag) { | 134 | if (pCtx->bReferenceLostAtT0Flag) { |
| 135 | ResetParameterSetsState (pCtx); | 135 | ResetParameterSetsState (pCtx); |
| @@ -143,7 +143,7 @@ inline void HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) · 7 unmodified lines | |||
| 143 | if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) { | 143 | if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) { |
| 144 | pCtx->bReferenceLostAtT0Flag = true; | 144 | pCtx->bReferenceLostAtT0Flag = true; |
| 145 | } | 145 | } |
| 146 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 146 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 147 | #ifndef LONG_TERM_REF | 147 | #ifndef LONG_TERM_REF |
| 148 | if (pCtx->bReferenceLostAtT0Flag) { | 148 | if (pCtx->bReferenceLostAtT0Flag) { |
| 149 | ResetParameterSetsState (pCtx); | 149 | ResetParameterSetsState (pCtx); |
| @@ -959,7 +959,7 @@ int32_t UpdateAccessUnit (PWelsDecoderContext pCtx) { · 809 unmodified lines | |||
| 959 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 959 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 960 | "UpdateAccessUnit():::::Key frame lost.....CAN NOT find IDR from current AU.\n"); | 960 | "UpdateAccessUnit():::::Key frame lost.....CAN NOT find IDR from current AU.\n"); |
| 961 | pCtx->iErrorCode |= dsRefLost; | 961 | pCtx->iErrorCode |= dsRefLost; |
| 962 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 962 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 963 | #ifdef LONG_TERM_REF | 963 | #ifdef LONG_TERM_REF |
| 964 | pCtx->iErrorCode |= dsNoParamSets; | 964 | pCtx->iErrorCode |= dsNoParamSets; |
| 965 | return dsNoParamSets; | 965 | return dsNoParamSets; |
| @@ -1887,7 +1887,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 921 unmodified lines | |||
| 1887 | pSh->iFrameNum); | 1887 | pSh->iFrameNum); |
| 1888 | 1888 | ||
| 1889 | pCtx->iErrorCode |= dsRefLost; | 1889 | pCtx->iErrorCode |= dsRefLost; |
| 1890 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 1890 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 1891 | #ifdef LONG_TERM_REF | 1891 | #ifdef LONG_TERM_REF |
| 1892 | pCtx->bParamSetsLostFlag = true; | 1892 | pCtx->bParamSetsLostFlag = true; |
| 1893 | #else | 1893 | #else |
| @@ -1906,7 +1906,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 12 unmodified lines | |||
| 1906 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, | 1906 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, |
| 1907 | "reference picture introduced by this frame is lost during transmission! uiTId: %d\n", | 1907 | "reference picture introduced by this frame is lost during transmission! uiTId: %d\n", |
| 1908 | pNalCur->sNalHeaderExt.uiTemporalId); | 1908 | pNalCur->sNalHeaderExt.uiTemporalId); |
| 1909 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 1909 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 1910 | return iRet; | 1910 | return iRet; |
| 1911 | } | 1911 | } |
| 1912 | } | 1912 | } |
| @@ -1920,7 +1920,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 7 unmodified lines | |||
| 1920 | "DecodeCurrentAccessUnit() failed (%d) in frame: %d uiDId: %d uiQId: %d\n", | 1920 | "DecodeCurrentAccessUnit() failed (%d) in frame: %d uiDId: %d uiQId: %d\n", |
| 1921 | iRet, pSh->iFrameNum, iCurrIdD, iCurrIdQ); | 1921 | iRet, pSh->iFrameNum, iCurrIdD, iCurrIdQ); |
| 1922 | HandleReferenceLostL0 (pCtx, pNalCur); | 1922 | HandleReferenceLostL0 (pCtx, pNalCur); |
| 1923 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 1923 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 1924 | return iRet; | 1924 | return iRet; |
| 1925 | } | 1925 | } |
| 1926 | } | 1926 | } |
| @@ -1976,7 +1976,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 49 unmodified lines | |||
| 1976 | pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //store latest decoded picture for EC | 1976 | pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //store latest decoded picture for EC |
| 1977 | iRet = WelsMarkAsRef (pCtx); | 1977 | iRet = WelsMarkAsRef (pCtx); |
| 1978 | if (iRet != ERR_NONE) { | 1978 | if (iRet != ERR_NONE) { |
| 1979 | if (pCtx->iErrorConMethod == ERROR_CON_DISABLE) { | 1979 | if (pCtx->eErrorConMethod == ERROR_CON_DISABLE) { |
| 1980 | pCtx->pDec = NULL; | 1980 | pCtx->pDec = NULL; |
| 1981 | return iRet; | 1981 | return iRet; |
| 1982 | } | 1982 | } |