From e9395bbd351c40bafcd844f7fb6d42af80497936 Mon Sep 17 00:00:00 2001 From: volvet Date: Wed, 5 Mar 2014 15:17:07 +0800 Subject: [PATCH] remove un-supported mgs code --- codec/encoder/core/inc/param_svc.h | 5 ----- codec/encoder/core/src/encoder_ext.cpp | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/codec/encoder/core/inc/param_svc.h b/codec/encoder/core/inc/param_svc.h index f7389275..3f0c9eac 100644 --- a/codec/encoder/core/inc/param_svc.h +++ b/codec/encoder/core/inc/param_svc.h @@ -124,9 +124,6 @@ struct { 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 @@ -217,8 +214,6 @@ void FillDefault (const bool kbEnableRc) { 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); diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp index c284c740..2ee2242b 100644 --- a/codec/encoder/core/src/encoder_ext.cpp +++ b/codec/encoder/core/src/encoder_ext.cpp @@ -896,11 +896,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { } // 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"); @@ -3502,7 +3498,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo * pFbi, const SSou #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 }