Merge pull request #2246 from shihuade/MultiThread_V4.1_SliceCtx_V2_Pull

SSliceCtx structure refactoring----change input parameters for UpdateSl…
This commit is contained in:
ruil2 2015-11-18 13:42:20 +08:00
commit 174f09bd10

View File

@ -2764,7 +2764,8 @@ void WelsInitCurrentQBLayerMltslc (sWelsEncCtx* pCtx) {
DynslcUpdateMbNeighbourInfoListForAllSlices (pSliceCtx, pCurDq->sMbDataP);
}
void UpdateSlicepEncCtxWithPartition (SSliceCtx* pSliceCtx, int32_t iPartitionNum) {
void UpdateSlicepEncCtxWithPartition (SDqLayer* pCurDq, int32_t iPartitionNum) {
SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;
const int32_t kiMbNumInFrame = pSliceCtx->iMbNumInFrame;
int32_t iCountMbNumPerPartition = kiMbNumInFrame;
int32_t iAssignableMbLeft = kiMbNumInFrame;
@ -2800,7 +2801,7 @@ void WelsInitCurrentDlayerMltslc (sWelsEncCtx* pCtx, int32_t iPartitionNum) {
SDqLayer* pCurDq = pCtx->pCurDqLayer;
SSliceCtx* pSliceCtx = pCurDq->pSliceEncCtx;
UpdateSlicepEncCtxWithPartition (pSliceCtx, iPartitionNum);
UpdateSlicepEncCtxWithPartition (pCurDq, iPartitionNum);
if (I_SLICE == pCtx->eSliceType) { //check if uiSliceSizeConstraint too small
#define byte_complexIMBat26 (60)