History

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/svc_encode_slice.cpp (1 of 10 files). Show all

Unified · Split

codec/encoder/core/src/svc_encode_slice.cpp+5−5
@@ -94,7 +94,7 @@ void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* · 93 unmodified lines
9494
9595 pCurSliceExt->bStoreRefBasePicFlag = false;
9696
97− pCurSliceHeader->iFirstMbInSlice = WelsGetFirstMbOfSlice (pCurLayer->pSliceEncCtx, pSlice->uiSliceIdx);
97+ pCurSliceHeader->iFirstMbInSlice = WelsGetFirstMbOfSlice (&pCurLayer->sSliceEncCtx, pSlice->uiSliceIdx);
9898
9999 pCurSliceHeader->iFrameNum = pEncCtx->iFrameNum;
100100 pCurSliceHeader->uiIdrPicId = pEncCtx->uiIdrPicId;
@@ -483,7 +483,7 @@ void UpdateQpForOverflow (SMB* pCurMb, uint8_t kuiChromaQpIndexOffset) { · 382 unmodified lines
483483 //second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
484484 int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
485485 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
486− SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;
486+ SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
487487 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
488488 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;
489489 SMB* pMbList = pCurLayer->sMbDataP;
@@ -546,7 +546,7 @@ TRY_REENCODING: · 56 unmodified lines
546546 int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
547547 SBitStringAux* pBs = pSlice->pSliceBsa;
548548 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
549− SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;
549+ SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
550550 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
551551 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;
552552 SMB* pMbList = pCurLayer->sMbDataP;
@@ -942,7 +942,7 @@ int32_t WelsMdInterMbLoop (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pWelsMd, · 389 unmodified lines
942942 SWelsMD* pMd = (SWelsMD*)pWelsMd;
943943 SBitStringAux* pBs = pSlice->pSliceBsa;
944944 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
945− SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;
945+ SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
946946 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
947947 SMB* pMbList = pCurLayer->sMbDataP;
948948 SMB* pCurMb = NULL;
@@ -1033,7 +1033,7 @@ int32_t WelsMdInterMbLoopOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice, · 84 unmodified lines
10331033 SWelsMD* pMd = (SWelsMD*)pWelsMd;
10341034 SBitStringAux* pBs = pSlice->pSliceBsa;
10351035 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
1036− SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;
1036+ SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
10371037 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
10381038 SMB* pMbList = pCurLayer->sMbDataP;
10391039 SMB* pCurMb = NULL;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t