remove (ppCtx)->pSliceCtxList and only keep DqLayer->sSliceCtx to simply the structure manage

huade committed 10 years ago

Commit 35ab32b1 parent f9d8e9a10 files · +67 −84Browse files

Showing the changes to codec/encoder/core/src/deblocking.cpp (1 of 10 files). Show all

Unified · Split

codec/encoder/core/src/deblocking.cpp+2−2

@@ -691,7 +691,7 @@ void DeblockingFilterFrameAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc) { · 690 unmodified lines
691	}	691	}
692		692
693	void DeblockingFilterSliceAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, const int32_t kiSliceIdx) {	693	void DeblockingFilterSliceAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, const int32_t kiSliceIdx) {
694	SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;	694	SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
695	SMB* pMbList = pCurDq->sMbDataP;	695	SMB* pMbList = pCurDq->sMbDataP;
696	SSliceHeaderExt* sSliceHeaderExt = &pCurDq->sLayerInfo.pSliceInLayer[kiSliceIdx].sSliceHeaderExt;	696	SSliceHeaderExt* sSliceHeaderExt = &pCurDq->sLayerInfo.pSliceInLayer[kiSliceIdx].sSliceHeaderExt;
697	SMB* pCurrentMbBlock;	697	SMB* pCurrentMbBlock;
@@ -755,7 +755,7 @@ void PerformDeblockingFilter (sWelsEncCtx* pEnc) { · 57 unmodified lines
755	int32_t iSliceIdx = 0;	755	int32_t iSliceIdx = 0;
756		756
757	if (SM_SIZELIMITED_SLICE != pSpatialLayer->sSliceArgument.uiSliceMode) {	757	if (SM_SIZELIMITED_SLICE != pSpatialLayer->sSliceArgument.uiSliceMode) {
758	iSliceCount = GetCurrentSliceNum (pCurLayer->pSliceEncCtx);	758	iSliceCount = GetCurrentSliceNum (&pCurLayer->sSliceEncCtx);
759	do {	759	do {
760	DeblockingFilterSliceAvcbase (pCurLayer, pEnc->pFuncList, iSliceIdx);	760	DeblockingFilterSliceAvcbase (pCurLayer, pEnc->pFuncList, iSliceIdx);
761	++ iSliceIdx;	761	++ iSliceIdx;