Showing the changes to codec/decoder/core/inc (3 of 9 files). Show all
Unified · Split
| @@ -74,6 +74,7 @@ struct TagDqLayer { · 73 unmodified lines | ||
| 74 | 74 | int8_t (*pNzcRs)[24]; |
| 75 | 75 | int8_t* pResidualPredFlag; |
| 76 | 76 | int8_t* pInterPredictionDoneFlag; |
| 77 | + bool* pMbCorrectlyDecodedFlag; | |
| 77 | 78 | int16_t (*pScaledTCoeff)[MB_COEFF_LIST_SIZE]; |
| 78 | 79 | int8_t (*pIntraPredMode)[8]; //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16 |
| 79 | 80 | int8_t (*pIntra4x4FinalMode)[MB_BLOCK4x4_NUM]; |
| @@ -211,6 +211,7 @@ typedef struct TagWelsDecoderContext { · 210 unmodified lines | ||
| 211 | 211 | int32_t* pSliceIdc[LAYER_NUM_EXCHANGEABLE]; // using int32_t for slice_idc |
| 212 | 212 | int8_t* pResidualPredFlag[LAYER_NUM_EXCHANGEABLE]; |
| 213 | 213 | int8_t* pInterPredictionDoneFlag[LAYER_NUM_EXCHANGEABLE]; |
| 214 | + bool* pMbCorrectlyDecodedFlag[LAYER_NUM_EXCHANGEABLE]; | |
| 214 | 215 | uint32_t iMbWidth; |
| 215 | 216 | uint32_t iMbHeight; |
| 216 | 217 | } sMb; |
| @@ -279,6 +280,7 @@ typedef struct TagWelsDecoderContext { · 62 unmodified lines | ||
| 279 | 280 | #endif |
| 280 | 281 | bool bNewSeqBegin; |
| 281 | 282 | int32_t iErrorConMethod; // |
| 283 | + PPicture pPreviousDecodedPictureInDpb; //pointer to previously decoded picture in DPB for error concealment | |
| 282 | 284 | PGetIntraPredFunc pGetI16x16LumaPredFunc[7]; //h264_predict_copy_16x16; |
| 283 | 285 | PGetIntraPredFunc pGetI4x4LumaPredFunc[14]; // h264_predict_4x4_t |
| 284 | 286 | PGetIntraPredFunc pGetIChromaPredFunc[7]; // h264_predict_8x8_t |
| @@ -293,7 +295,7 @@ typedef struct TagWelsDecoderContext { · 8 unmodified lines | ||
| 293 | 295 | |
| 294 | 296 | /* For Block */ |
| 295 | 297 | SBlockFunc sBlockFunc; |
| 296 | − /* For EC */ | |
| 298 | + | |
| 297 | 299 | int32_t iCurSeqIntervalTargetDependId; |
| 298 | 300 | int32_t iCurSeqIntervalMaxPicWidth; |
| 299 | 301 | int32_t iCurSeqIntervalMaxPicHeight; |
| @@ -54,7 +54,7 @@ int32_t MarkECFrameAsRef (PWelsDecoderContext pCtx); · 53 unmodified lines | ||
| 54 | 54 | bool NeedErrorCon (PWelsDecoderContext pCtx); |
| 55 | 55 | // ImplementErrorConceal |
| 56 | 56 | // Do actual error concealment |
| 57 | −int32_t ImplementErrorCon (PWelsDecoderContext pCtx); | |
| 57 | +void ImplementErrorCon (PWelsDecoderContext pCtx); | |
| 58 | 58 | |
| 59 | 59 | } // namespace WelsDec |
| 60 | 60 | |