History

Multi-thread-fixed:RBC#1708:pSlice instead of ppSliceInLayer in MB RC init/update etc. functions

huade committed 9 years ago

Commit 067aa851 parent f40452d6 files · +17 −39Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+3−2
@@ -924,8 +924,6 @@ int32_t InitMbListD (sWelsEncCtx** ppCtx) { · 923 unmodified lines
924 924
925void FreeSliceInLayer (SDqLayer* pDq, CMemoryAlign* pMa) {925void FreeSliceInLayer (SDqLayer* pDq, CMemoryAlign* pMa) {
926 int32_t iIdx = 0;926 int32_t iIdx = 0;
927
928 FreeSliceBuffer (pDq->sLayerInfo.pSliceInLayer, pDq->iMaxSliceNum, pMa, "pSliceInLayer");
929 for (; iIdx < MAX_THREADS_NUM; iIdx ++) {927 for (; iIdx < MAX_THREADS_NUM; iIdx ++) {
930 FreeSliceBuffer (pDq->sSliceThreadInfo.pSliceInThread[iIdx],928 FreeSliceBuffer (pDq->sSliceThreadInfo.pSliceInThread[iIdx],
931 pDq->sSliceThreadInfo.iMaxSliceNumInThread[iIdx],929 pDq->sSliceThreadInfo.iMaxSliceNumInThread[iIdx],
@@ -3777,6 +3775,9 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 2845 unmodified lines
3777 //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum]3775 //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum]
3778 // UpdateSliceInLayerInfo(); // reordering3776 // UpdateSliceInLayerInfo(); // reordering
3779 3777
3778 //TO DO: add update ppSliceInLayer module based on pSliceInThread[ThreadNum]
3779 // UpdateSliceInLayerInfo(); // reordering
3780
3780 iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt);3781 iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, kiPartitionCnt);
3781 } else { // for non-dynamic-slicing mode single threading branch..3782 } else { // for non-dynamic-slicing mode single threading branch..
3782 const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;3783 const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;

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