fix decodestatus uiEcRatio calc bug

dong zhang committed 11 years ago

Commit ecc8ae61 parent 065c3a74 files · +15 −19Browse files

Showing the changes to codec/decoder (4 of 4 files). Show all

Unified · Split

4 files

codec/decoder/core/inc/decoder_context.h +2 −0
codec/decoder/core/src/decoder_core.cpp +2 −1
codec/decoder/core/src/error_concealment.cpp +8 −14
codec/decoder/plus/src/welsDecoderExt.cpp +3 −4

codec/decoder/core/inc/decoder_context.h+2−0

@@ -400,6 +400,8 @@ SWelsCabacCtx pCabacCtx[WELS_CONTEXT_COUNT]; · 399 unmodified lines
400	400	PWelsCabacDecEngine pCabacDecEngine;
401	401	double dDecTime;
402	402	SDecoderStatistics sDecoderStatistics;// For real time debugging
	403	+int32_t iMbEcedNum;
	404	+int32_t iMbNum;
403	405	int32_t iECMVs[16][2];
404	406	PPicture pECRefPic[16];
405	407	unsigned long long uiTimeStamp;

codec/decoder/core/src/decoder_core.cpp+2−1

@@ -1683,7 +1683,8 @@ static void WriteBackActiveParameters (PWelsDecoderContext pCtx) { · 1682 unmodified lines
1683	1683	int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
1684	1684	int32_t iErr;
1685	1685	PAccessUnit pCurAu = pCtx->pAccessUnitList;
1686		−
	1686	+ pCtx->iMbEcedNum = 0;
	1687	+ pCtx->iMbNum = 0;
1687	1688	pCtx->bAuReadyFlag = false;
1688	1689	pCtx->bLastHasMmco5 = false;
1689	1690	bool bTmpNewSeqBegin = CheckNewSeqBeginAndUpdateActiveLayerSps (pCtx);

codec/decoder/core/src/error_concealment.cpp+8−14

@@ -82,6 +82,8 @@ void DoErrorConFrameCopy (PWelsDecoderContext pCtx) { · 81 unmodified lines
82	82	uint32_t uiHeightInPixelY = (pCtx->pSps->iMbHeight) << 4;
83	83	int32_t iStrideY = pDstPic->iLinesize[0];
84	84	int32_t iStrideUV = pDstPic->iLinesize[1];
	85	+ pCtx->iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
	86	+ pCtx->iMbEcedNum = pCtx->iMbNum;
85	87	if ((pCtx->eErrorConMethod == ERROR_CON_FRAME_COPY) && (pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.bIdrFlag))
86	88	pSrcPic = NULL; //no cross IDR method, should fill in data instead of copy
87	89	if (pSrcPic == NULL) { //no ref pic, assign specific data to picture
@@ -105,10 +107,10 @@ void DoErrorConSliceCopy (PWelsDecoderContext pCtx) { · 17 unmodified lines
105	107	if ((pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY) && (pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.bIdrFlag))
106	108	pSrcPic = NULL; //no cross IDR method, should fill in data instead of copy
107	109
108		− int32_t iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
	110	+ pCtx->iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
109	111	//uint8_t pDstData[3], pSrcData[3];
110	112	bool* pMbCorrectlyDecodedFlag = pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag;
111		− int32_t iMbEcedNum = 0;
	113	+ pCtx->iMbEcedNum = 0;
112	114	//Do slice copy late
113	115	int32_t iMbXyIndex;
114	116	uint8_t* pSrcData, *pDstData;
@@ -118,7 +120,7 @@ void DoErrorConSliceCopy (PWelsDecoderContext pCtx) { · 3 unmodified lines
118	120	for (int32_t iMbX = 0; iMbX < iMbWidth; ++iMbX) {
119	121	iMbXyIndex = iMbY * iMbWidth + iMbX;
120	122	if (!pMbCorrectlyDecodedFlag[iMbXyIndex]) {
121		− iMbEcedNum++;
	123	+ pCtx->iMbEcedNum++;
122	124	if (pSrcPic != NULL) {
123	125	iSrcStride = pSrcPic->iLinesize[0];
124	126	//Y component
@@ -156,10 +158,6 @@ void DoErrorConSliceCopy (PWelsDecoderContext pCtx) { · 31 unmodified lines
156	158	} //!pMbCorrectlyDecodedFlag[iMbXyIndex]
157	159	} //iMbX
158	160	} //iMbY
159		−
160		− if (!pCtx->bFreezeOutput)
161		− pCtx->sDecoderStatistics.uiAvgEcRatio = (pCtx->sDecoderStatistics.uiAvgEcRatio * pCtx->sDecoderStatistics.uiEcFrameNum)
162		− + ((iMbEcedNum * 100) / iMbNum) ;
163	161	}
164	162
165	163	//Do error concealment using slice MV copy method
@@ -368,9 +366,9 @@ void DoErrorConSliceMVCopy (PWelsDecoderContext pCtx) { · 202 unmodified lines
368	366	PPicture pDstPic = pCtx->pDec;
369	367	PPicture pSrcPic = pCtx->pPreviousDecodedPictureInDpb;
370	368
371		− int32_t iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
	369	+ pCtx->iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
372	370	bool* pMbCorrectlyDecodedFlag = pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag;
373		− int32_t iMbEcedNum = 0;
	371	+ pCtx->iMbEcedNum = 0;
374	372	int32_t iMbXyIndex;
375	373	uint8_t* pDstData;
376	374	uint32_t iDstStride = pDstPic->iLinesize[0];
@@ -395,7 +393,7 @@ void DoErrorConSliceMVCopy (PWelsDecoderContext pCtx) { · 18 unmodified lines
395	393	for (int32_t iMbX = 0; iMbX < iMbWidth; ++iMbX) {
396	394	iMbXyIndex = iMbY * iMbWidth + iMbX;
397	395	if (!pMbCorrectlyDecodedFlag[iMbXyIndex]) {
398		− iMbEcedNum++;
	396	+ pCtx->iMbEcedNum++;
399	397	if (pSrcPic != NULL) {
400	398	DoMbECMvCopy (pCtx, pDstPic, pSrcPic, iMbXyIndex, iMbX, iMbY, &sMCRefMem);
401	399	} else { //pSrcPic == NULL
@@ -422,10 +420,6 @@ void DoErrorConSliceMVCopy (PWelsDecoderContext pCtx) { · 20 unmodified lines
422	420	} //!pMbCorrectlyDecodedFlag[iMbXyIndex]
423	421	} //iMbX
424	422	} //iMbY
425		−
426		− if (!pCtx->bFreezeOutput)
427		− pCtx->sDecoderStatistics.uiAvgEcRatio = (pCtx->sDecoderStatistics.uiAvgEcRatio * pCtx->sDecoderStatistics.uiEcFrameNum)
428		− + ((iMbEcedNum * 100) / iMbNum) ;
429	423	}
430	424
431	425	//Mark erroneous frame as Ref Pic into DPB

codec/decoder/plus/src/welsDecoderExt.cpp+3−4

@@ -385,6 +385,8 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 384 unmodified lines
385	385	const int kiSrcLen,
386	386	unsigned char** ppDst,
387	387	SBufferInfo* pDstInfo) {
	388	+ m_pDecContext->iMbEcedNum = 0;
	389	+ m_pDecContext->iMbNum = 0;
388	390	if (CheckBsBuffer (m_pDecContext, kiSrcLen)) {
389	391	return dsOutOfMemory;
390	392	}
@@ -464,10 +466,6 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 73 unmodified lines
464	466	if ((m_pDecContext->eErrorConMethod != ERROR_CON_DISABLE) && (pDstInfo->iBufferStatus == 1)) {
465	467	//TODO after dec status updated
466	468	m_pDecContext->iErrorCode \|= dsDataErrorConcealed;
467		− if (m_pDecContext->eErrorConMethod == ERROR_CON_FRAME_COPY)
468		−
469		− m_pDecContext->sDecoderStatistics.uiAvgEcRatio = (m_pDecContext->sDecoderStatistics.uiAvgEcRatio *
470		− m_pDecContext->sDecoderStatistics.uiEcFrameNum) + 100;
471	469
472	470	//
473	471	if ((m_pDecContext->sDecoderStatistics.uiWidth != (unsigned int) pDstInfo->UsrData.sSystemBuffer.iWidth)
@@ -482,6 +480,7 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 8 unmodified lines
482	480	ResetDecStatNums (&m_pDecContext->sDecoderStatistics);
483	481	m_pDecContext->sDecoderStatistics.uiDecodedFrameCount++;
484	482	}
	483	+ m_pDecContext->sDecoderStatistics.uiAvgEcRatio = m_pDecContext->iMbEcedNum == 0 ? (m_pDecContext->sDecoderStatistics.uiAvgEcRatio * m_pDecContext->sDecoderStatistics.uiEcFrameNum) :((m_pDecContext->sDecoderStatistics.uiAvgEcRatio * m_pDecContext->sDecoderStatistics.uiEcFrameNum) + ((m_pDecContext->iMbEcedNum * 100) / m_pDecContext->iMbNum));
485	484	m_pDecContext->sDecoderStatistics.uiEcFrameNum++;
486	485	m_pDecContext->sDecoderStatistics.uiAvgEcRatio = m_pDecContext->sDecoderStatistics.uiAvgEcRatio /
487	486	m_pDecContext->sDecoderStatistics.uiEcFrameNum;

fix decodestatus uiEcRatio calc bug

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code