From a783fed4078aa6d548f092e130a6a7466aa0f727 Mon Sep 17 00:00:00 2001 From: volvet Date: Fri, 21 Feb 2014 12:57:06 +0800 Subject: [PATCH] remove cgs/mgs related code, it is not supported --- codec/api/svc/codec_app_def.h | 2 -- codec/console/enc/src/welsenc.cpp | 14 -------------- codec/encoder/plus/src/welsEncoderExt.cpp | 6 ++---- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/codec/api/svc/codec_app_def.h b/codec/api/svc/codec_app_def.h index 12976c88..76c95050 100644 --- a/codec/api/svc/codec_app_def.h +++ b/codec/api/svc/codec_app_def.h @@ -168,12 +168,10 @@ typedef struct { int iVideoHeight; // video size in cy specified for a layer float fFrameRate; // frame rate specified for a layer int iSpatialBitrate; // target bitrate for a spatial layer - int iCgsSnrRefined; // 0: SNR layers all MGS; 1: SNR layers all CGS int iInterSpatialLayerPredFlag; // 0: diabled [independency spatial layer coding]; 1: enabled [base spatial layer dependency coding] unsigned int uiProfileIdc; // value of profile IDC (0 for auto-detection) int iDLayerQp; - int iQualityBitrate[MAX_QUALITY_LAYER_NUM]; // target bitrate for a quality layer SSliceConfig sSliceCfg; } SSpatialLayerConfig; diff --git a/codec/console/enc/src/welsenc.cpp b/codec/console/enc/src/welsenc.cpp index 4fa0289b..4680dfcb 100644 --- a/codec/console/enc/src/welsenc.cpp +++ b/codec/console/enc/src/welsenc.cpp @@ -657,8 +657,6 @@ int FillSpecificParameters (SEncParamExt& sParam) { sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 90; sParam.sSpatialLayers[iIndexLayer].fFrameRate = 7.5f; sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 64000; - sParam.sSpatialLayers[iIndexLayer].iCgsSnrRefined = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[0] = 0; sParam.sSpatialLayers[iIndexLayer].iInterSpatialLayerPredFlag = 0; #ifdef MT_ENABLED sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = 0; @@ -669,10 +667,6 @@ int FillSpecificParameters (SEncParamExt& sParam) { sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 180; sParam.sSpatialLayers[iIndexLayer].fFrameRate = 15.0f; sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 160000; - sParam.sSpatialLayers[iIndexLayer].iCgsSnrRefined = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[0] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[1] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[2] = 0; sParam.sSpatialLayers[iIndexLayer].iInterSpatialLayerPredFlag = 0; #ifdef MT_ENABLED sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = 0; @@ -683,10 +677,6 @@ int FillSpecificParameters (SEncParamExt& sParam) { sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 360; sParam.sSpatialLayers[iIndexLayer].fFrameRate = 30.0f; sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 512000; - sParam.sSpatialLayers[iIndexLayer].iCgsSnrRefined = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[0] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[1] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[2] = 0; sParam.sSpatialLayers[iIndexLayer].iInterSpatialLayerPredFlag = 0; #ifdef MT_ENABLED sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = 0; @@ -698,10 +688,6 @@ int FillSpecificParameters (SEncParamExt& sParam) { sParam.sSpatialLayers[iIndexLayer].iVideoHeight = 720; sParam.sSpatialLayers[iIndexLayer].fFrameRate = 30.0f; sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate = 1500000; - sParam.sSpatialLayers[iIndexLayer].iCgsSnrRefined = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[0] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[1] = 0; -// sParam.sSpatialLayers[iIndexLayer].iQualityBitrate[2] = 0; sParam.sSpatialLayers[iIndexLayer].iInterSpatialLayerPredFlag = 0; #ifdef MT_ENABLED sParam.sSpatialLayers[iIndexLayer].sSliceCfg.uiSliceMode = 0; diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp index 35b8383b..dbdbf224 100644 --- a/codec/encoder/plus/src/welsEncoderExt.cpp +++ b/codec/encoder/plus/src/welsEncoderExt.cpp @@ -279,12 +279,11 @@ int CWelsH264SVCEncoder::Initialize2 (SWelsSvcCodingParam* pCfg) { while (i < sEncodingParam.iSpatialLayerNum) { SSpatialLayerConfig* spatial_cfg = &sEncodingParam.sSpatialLayers[i]; WelsLog (m_pEncContext, WELS_LOG_INFO, - "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iCgsSnrRefined= %d; .iInterSpatialLayerPredFlag= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.uiSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", + "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iInterSpatialLayerPredFlag= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.uiSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", i, spatial_cfg->iVideoWidth, spatial_cfg->iVideoHeight, spatial_cfg->fFrameRate, spatial_cfg->iSpatialBitrate, - spatial_cfg->iCgsSnrRefined, spatial_cfg->iInterSpatialLayerPredFlag, spatial_cfg->sSliceCfg.uiSliceMode, spatial_cfg->sSliceCfg.sSliceArgument.uiSliceNum, @@ -771,12 +770,11 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { while (i < sEncodingParam.iSpatialLayerNum) { SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i]; WelsLog (m_pEncContext, WELS_LOG_INFO, - "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iCgsSnrRefined= %d; .iInterSpatialLayerPredFlag= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", + "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iInterSpatialLayerPredFlag= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", i, pSpatialCfg->iVideoWidth, pSpatialCfg->iVideoHeight, pSpatialCfg->fFrameRate, pSpatialCfg->iSpatialBitrate, - pSpatialCfg->iCgsSnrRefined, pSpatialCfg->iInterSpatialLayerPredFlag, pSpatialCfg->sSliceCfg.uiSliceMode, pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceNum,