shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #415 from volvet/remove-useless-mgs-code

remove un-supported mgs code

--- a/codec/encoder/core/inc/param_svc.h

+++ b/codec/encoder/core/inc/param_svc.h

@@ -124,10 +124,7 @@

 char*       pCurPath; // record current lib path such as:/pData/pData/com.wels.enc/lib/

 bool		bDeblockingParallelFlag;	// deblocking filter parallelization control flag

-bool		bMgsT0OnlyStrategy; //MGS_T0_only_strategy

-// FALSE: Streaming Video Sharing; TRUE: Video Conferencing Meeting;

-

 int8_t		iDecompStages;		// GOP size dependency

@@ -214,8 +211,6 @@

   bDeblockingParallelFlag = false;	// deblocking filter parallelization control flag

-  bMgsT0OnlyStrategy			=

-    true;	// Strategy of have MGS only at T0 frames (0: do not use this strategy; 1: use this strategy)

   iDecompStages				= 0;	// GOP size dependency, unknown here and be revised later

   memset(sDependencyLayers,0,sizeof(SDLayerParam)*MAX_DEPENDENCY_LAYER);

--- a/codec/encoder/core/src/encoder_ext.cpp

+++ b/codec/encoder/core/src/encoder_ext.cpp

@@ -892,11 +892,7 @@

   }

   // for dynamically malloc for parameter sets memory instead of maximal items for standard to reduce size, 3/18/2010

-  if (& (*ppCtx)->pSvcParam->bMgsT0OnlyStrategy) {

-    (*ppCtx)->pPPSArray	= (SWelsPPS*)pMa->WelsMalloc ((1 + iDlayerCount) * sizeof (SWelsPPS), "pPPSArray");

-  } else {

-    (*ppCtx)->pPPSArray	= (SWelsPPS*)pMa->WelsMalloc (iDlayerCount * sizeof (SWelsPPS), "pPPSArray");

-  }

+  (*ppCtx)->pPPSArray	= (SWelsPPS*)pMa->WelsMalloc (iDlayerCount * sizeof (SWelsPPS), "pPPSArray");

   WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pPPSArray), FreeMemorySvc (ppCtx))

   (*ppCtx)->pSpsArray	= (SWelsSPS*)pMa->WelsMalloc (sizeof (SWelsSPS), "pSpsArray");

@@ -3498,7 +3494,6 @@

 #endif//MB_TYPES_CHECK

     {

-      //no pCtx->pSvcParam->bMgsT0OnlyStrategy

       ++ pCtx->sStatData[iCurDid][0].sSliceData.iSliceCount[pCtx->eSliceType];	// for multiple slices coding

       pCtx->sStatData[iCurDid][0].sSliceData.iSliceSize[pCtx->eSliceType]	+= (iLayerSize << 3);	// bits

     }