shithub: openh264

Download patch

ref: 174f09bd104246f68c5ae68fd6642fb6f814a6bd
parent: a8584b530f4ba9b355ec11c735e14a0e673a7c1d
parent: 8d44427dc6cd6e24c9cc6d7661bed981568e551d
author: ruil2 <[email protected]>
date: Wed Nov 18 08:42:20 EST 2015 

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

SSliceCtx structure refactoring----change input parameters for UpdateSl…


--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -2764,7 +2764,8 @@
   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 @@
   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)