unitfy slice bs writing for multi-thread(sliceindex==0 is the same with others )

huade committed 10 years ago

Commit dcfe76d1 parent 6dc3f723 files · +10 −26Browse files

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

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+1−2

@@ -1792,7 +1792,7 @@ int32_t RequestMemorySvc (sWelsEncCtx** ppCtx, SExistingParasetList* pExistingPa · 1791 unmodified lines
1792	1792	iCountBsLen = iNonVclLayersBsSizeCount + iVclLayersBsSizeCount;
1793	1793
1794	1794	iMaxSliceBufferSize = WELS_MIN (iMaxSliceBufferSize, iTargetSpatialBsSize);
1795		− iTotalLength = (pParam->iMultipleThreadIdc == 1) ? iCountBsLen : (iCountBsLen + ((ppCtx)->iMaxSliceCount - 1)
	1795	+ iTotalLength = (pParam->iMultipleThreadIdc == 1) ? iCountBsLen : (iCountBsLen + (ppCtx)->iMaxSliceCount
1796	1796	iMaxSliceBufferSize);
1797	1797
1798	1798	pParam->iNumRefFrame = WELS_CLIP3 (pParam->iNumRefFrame, MIN_REF_PIC_COUNT,
@@ -3998,7 +3998,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 2199 unmodified lines
3998	3998	pLayerBsInfo->uiTemporalId = pCtx->uiTemporalId;
3999	3999	pLayerBsInfo->uiQualityId = 0;
4000	4000	pLayerBsInfo->iNalCount = 0;
4001		− pCtx->pSliceBs[0].pBs = pLayerBsInfo->pBsBuf;
4002	4001
4003	4002	pCtx->pTaskManage->ExecuteTasks();
4004	4003	iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, iSliceCount);