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
94 94
95 pCurSliceExt->bStoreRefBasePicFlag = false;95 pCurSliceExt->bStoreRefBasePicFlag = false;
96 96
97 pCurSliceHeader->iFirstMbInSlice = WelsGetFirstMbOfSlice (pCurLayer->pSliceEncCtx, pSlice->uiSliceIdx);97 pCurSliceHeader->iFirstMbInSlice = WelsGetFirstMbOfSlice (&pCurLayer->sSliceEncCtx, pSlice->uiSliceIdx);
98 98
99 pCurSliceHeader->iFrameNum = pEncCtx->iFrameNum;99 pCurSliceHeader->iFrameNum = pEncCtx->iFrameNum;
100 pCurSliceHeader->uiIdrPicId = pEncCtx->uiIdrPicId;100 pCurSliceHeader->uiIdrPicId = pEncCtx->uiIdrPicId;
@@ -483,7 +483,7 @@ void UpdateQpForOverflow (SMB* pCurMb, uint8_t kuiChromaQpIndexOffset) { · 382 unmodified lines
483//second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)483//second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
484int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding484int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
485 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;485 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
486 SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;486 SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
487 SMbCache* pMbCache = &pSlice->sMbCacheInfo;487 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
488 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;488 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;
489 SMB* pMbList = pCurLayer->sMbDataP;489 SMB* pMbList = pCurLayer->sMbDataP;
@@ -546,7 +546,7 @@ TRY_REENCODING: · 56 unmodified lines
546int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding546int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
547 SBitStringAux* pBs = pSlice->pSliceBsa;547 SBitStringAux* pBs = pSlice->pSliceBsa;
548 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;548 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
549 SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;549 SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
550 SMbCache* pMbCache = &pSlice->sMbCacheInfo;550 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
551 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;551 SSliceHeaderExt* pSliceHdExt = &pSlice->sSliceHeaderExt;
552 SMB* pMbList = pCurLayer->sMbDataP;552 SMB* pMbList = pCurLayer->sMbDataP;
@@ -942,7 +942,7 @@ int32_t WelsMdInterMbLoop (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pWelsMd, · 389 unmodified lines
942 SWelsMD* pMd = (SWelsMD*)pWelsMd;942 SWelsMD* pMd = (SWelsMD*)pWelsMd;
943 SBitStringAux* pBs = pSlice->pSliceBsa;943 SBitStringAux* pBs = pSlice->pSliceBsa;
944 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;944 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
945 SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;945 SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
946 SMbCache* pMbCache = &pSlice->sMbCacheInfo;946 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
947 SMB* pMbList = pCurLayer->sMbDataP;947 SMB* pMbList = pCurLayer->sMbDataP;
948 SMB* pCurMb = NULL;948 SMB* pCurMb = NULL;
@@ -1033,7 +1033,7 @@ int32_t WelsMdInterMbLoopOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice, · 84 unmodified lines
1033 SWelsMD* pMd = (SWelsMD*)pWelsMd;1033 SWelsMD* pMd = (SWelsMD*)pWelsMd;
1034 SBitStringAux* pBs = pSlice->pSliceBsa;1034 SBitStringAux* pBs = pSlice->pSliceBsa;
1035 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;1035 SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
1036 SSliceCtx* pSliceCtx = pCurLayer->pSliceEncCtx;1036 SSliceCtx* pSliceCtx = &pCurLayer->sSliceEncCtx;
1037 SMbCache* pMbCache = &pSlice->sMbCacheInfo;1037 SMbCache* pMbCache = &pSlice->sMbCacheInfo;
1038 SMB* pMbList = pCurLayer->sMbDataP;1038 SMB* pMbList = pCurLayer->sMbDataP;
1039 SMB* pCurMb = NULL;1039 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