History

change input parameters for DynamicAdjustSlicePEncCtxAll etc, SSliceCtx refactoring

huade committed 11 years ago

Commit c842c5c1 parent e4229db8 files · +31 −27Browse files

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

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+3−2
@@ -127,7 +127,8 @@ void UpdateMbListNeighborParallel (SDqLayer* pCurDq, · 126 unmodified lines
127 } while (iIdx <= kiEndMbInSlice);127 } while (iIdx <= kiEndMbInSlice);
128}128}
129 129
130void CalcSliceComplexRatio (void* pRatio, SSliceCtx* pSliceCtx, uint32_t* pSliceConsume) {130void CalcSliceComplexRatio (void* pRatio, SDqLayer* pCurDq, uint32_t* pSliceConsume) {
131 SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
131 int32_t* pRatioList = (int32_t*)pRatio;132 int32_t* pRatioList = (int32_t*)pRatio;
132 int32_t iAvI[MAX_SLICES_NUM];133 int32_t iAvI[MAX_SLICES_NUM];
133 int32_t iSumAv = 0;134 int32_t iSumAv = 0;
@@ -279,7 +280,7 @@ void DynamicAdjustSlicing (sWelsEncCtx* pCtx, · 145 unmodified lines
279 iSliceIdx, pSliceComplexRatio[iSliceIdx] * 1.0f / INT_MULTIPLY, pSliceCtx->pCountMbNumInSlice[iSliceIdx], iMbNumLeft);280 iSliceIdx, pSliceComplexRatio[iSliceIdx] * 1.0f / INT_MULTIPLY, pSliceCtx->pCountMbNumInSlice[iSliceIdx], iMbNumLeft);
280 281
281 282
282 if (DynamicAdjustSlicePEncCtxAll (pSliceCtx, iRunLen) == 0) {283 if (DynamicAdjustSlicePEncCtxAll (pCurDqLayer, iRunLen) == 0) {
283 const int32_t kiThreadNum = pCtx->pSvcParam->iCountThreadsNum;284 const int32_t kiThreadNum = pCtx->pSvcParam->iCountThreadsNum;
284 int32_t iThreadIdx = 0;285 int32_t iThreadIdx = 0;
285 do {286 do {

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