shithub: openh264

Download patch

ref: c298755da55d89d842551da6272e42613ce0f61f
parent: b60bb67b4e7243979f83256155f26852b1cdca1c
author: huade <[email protected]>
date: Thu Nov 19 08:29:16 EST 2015 

SSliceCtx structure refactoring----change input parameters for AssignMbMapMultipleSlices


--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp
+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -62,12 +62,13 @@
 /*!
  * \brief   Assign MB map for multiple slice(s) segment
  *
- * \param   pMbMap          overall MB map
- * \param   iCountMbNum     count number of MB
+ * \param   pCurDq              current layer which its MB map will be assigned
+ * \param   kpSliceArgument     slice argument for current layer
  *
  * \return  0 - successful; none 0 - failed
  */
-int32_t AssignMbMapMultipleSlices (SSliceCtx* pSliceSeg, const SSliceArgument* kpSliceArgument) {
+int32_t AssignMbMapMultipleSlices (SDqLayer* pCurDq,const SSliceArgument* kpSliceArgument) {
+  SSliceCtx* pSliceSeg = &pCurDq->sSliceEncCtx;
   if (NULL == pSliceSeg || SM_SINGLE_SLICE == pSliceSeg->uiSliceMode)
     return 1;
 
@@ -469,7 +470,7 @@
     pSliceSeg->iMaxSliceNumConstraint = MAX_SLICES_NUM;
 
 
-    return AssignMbMapMultipleSlices (pSliceSeg, pSliceArgument);
+    return AssignMbMapMultipleSlices (pCurDq, pSliceArgument);
   }
   return 0;
 }