add EC frame/slice copy.

huili2 committed 12 years ago

Commit bc2c4b01 parent b2f71919 files · +156 −21Browse files

Showing the changes to codec/decoder/core/inc (3 of 9 files). Show all

Unified · Split

3 files

codec/decoder/core/inc/dec_frame.h +1 −0
codec/decoder/core/inc/decoder_context.h +3 −1
codec/decoder/core/inc/error_concealment.h +1 −1

@@ -74,6 +74,7 @@ struct TagDqLayer { · 73 unmodified lines
74	int8_t (*pNzcRs)[24];	74	int8_t (*pNzcRs)[24];
75	int8_t* pResidualPredFlag;	75	int8_t* pResidualPredFlag;
76	int8_t* pInterPredictionDoneFlag;	76	int8_t* pInterPredictionDoneFlag;
		77	bool* pMbCorrectlyDecodedFlag;
77	int16_t (*pScaledTCoeff)[MB_COEFF_LIST_SIZE];	78	int16_t (*pScaledTCoeff)[MB_COEFF_LIST_SIZE];
78	int8_t (*pIntraPredMode)[8]; //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16	79	int8_t (*pIntraPredMode)[8]; //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16
79	int8_t (*pIntra4x4FinalMode)[MB_BLOCK4x4_NUM];	80	int8_t (*pIntra4x4FinalMode)[MB_BLOCK4x4_NUM];

codec/decoder/core/inc/decoder_context.h+3−1

@@ -211,6 +211,7 @@ typedef struct TagWelsDecoderContext { · 210 unmodified lines
211	int32_t* pSliceIdc[LAYER_NUM_EXCHANGEABLE]; // using int32_t for slice_idc	211	int32_t* pSliceIdc[LAYER_NUM_EXCHANGEABLE]; // using int32_t for slice_idc
212	int8_t* pResidualPredFlag[LAYER_NUM_EXCHANGEABLE];	212	int8_t* pResidualPredFlag[LAYER_NUM_EXCHANGEABLE];
213	int8_t* pInterPredictionDoneFlag[LAYER_NUM_EXCHANGEABLE];	213	int8_t* pInterPredictionDoneFlag[LAYER_NUM_EXCHANGEABLE];
		214	bool* pMbCorrectlyDecodedFlag[LAYER_NUM_EXCHANGEABLE];
214	uint32_t iMbWidth;	215	uint32_t iMbWidth;
215	uint32_t iMbHeight;	216	uint32_t iMbHeight;
216	} sMb;	217	} sMb;
@@ -279,6 +280,7 @@ typedef struct TagWelsDecoderContext { · 62 unmodified lines
279	#endif	280	#endif
280	bool bNewSeqBegin;	281	bool bNewSeqBegin;
281	int32_t iErrorConMethod; //	282	int32_t iErrorConMethod; //
		283	PPicture pPreviousDecodedPictureInDpb; //pointer to previously decoded picture in DPB for error concealment
282	PGetIntraPredFunc pGetI16x16LumaPredFunc[7]; //h264_predict_copy_16x16;	284	PGetIntraPredFunc pGetI16x16LumaPredFunc[7]; //h264_predict_copy_16x16;
283	PGetIntraPredFunc pGetI4x4LumaPredFunc[14]; // h264_predict_4x4_t	285	PGetIntraPredFunc pGetI4x4LumaPredFunc[14]; // h264_predict_4x4_t
284	PGetIntraPredFunc pGetIChromaPredFunc[7]; // h264_predict_8x8_t	286	PGetIntraPredFunc pGetIChromaPredFunc[7]; // h264_predict_8x8_t
@@ -293,7 +295,7 @@ typedef struct TagWelsDecoderContext { · 8 unmodified lines
293		295
294	/* For Block */	296	/* For Block */
295	SBlockFunc sBlockFunc;	297	SBlockFunc sBlockFunc;
296	/* For EC */	298
297	int32_t iCurSeqIntervalTargetDependId;	299	int32_t iCurSeqIntervalTargetDependId;
298	int32_t iCurSeqIntervalMaxPicWidth;	300	int32_t iCurSeqIntervalMaxPicWidth;
299	int32_t iCurSeqIntervalMaxPicHeight;	301	int32_t iCurSeqIntervalMaxPicHeight;

codec/decoder/core/inc/error_concealment.h+1−1

@@ -54,7 +54,7 @@ int32_t MarkECFrameAsRef (PWelsDecoderContext pCtx); · 53 unmodified lines
54	bool NeedErrorCon (PWelsDecoderContext pCtx);	54	bool NeedErrorCon (PWelsDecoderContext pCtx);
55	// ImplementErrorConceal	55	// ImplementErrorConceal
56	// Do actual error concealment	56	// Do actual error concealment
57	int32_t ImplementErrorCon (PWelsDecoderContext pCtx);	57	void ImplementErrorCon (PWelsDecoderContext pCtx);
58		58
59	} // namespace WelsDec	59	} // namespace WelsDec
60		60

add EC frame/slice copy.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code