commit 9c95d6a0b10d2e40cb5003934ccc98af6330dfcb Author: JuannyWang <hongjwan@cisco.com> Date: Thu Jun 19 10:43:15 2014 +0800 [delay skip] delay skip to relieve bitrate burst somehow
Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 15 files). Show all
Unified · Split
| @@ -623,10 +623,11 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 622 unmodified lines | ||
| 623 | 623 | WelsLog (m_pEncContext, WELS_LOG_INFO, "ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, sEncodingParam.iInputCsp= 0x%x\n", |
| 624 | 624 | sEncodingParam.iInputCsp); |
| 625 | 625 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 626 | − "coding_param->iPicWidth= %d;coding_param->iPicHeight= %d;coding_param->iTargetBitrate= %d;coding_param->iRCMode= %d;coding_param->iPaddingFlag= %d;coding_param->iTemporalLayerNum= %d;coding_param->iSpatialLayerNum= %d;coding_param->fFrameRate= %.6ff;coding_param->iInputCsp= %d;coding_param->uiIntraPeriod= %d;coding_param->bEnableSpsPpsIdAddition = %d;coding_param->bPrefixNalAddingCtrl = %d;coding_param->bEnableDenoise= %d;coding_param->bEnableBackgroundDetection= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableLongTermReference= %d;coding_param->iLtrMarkPeriod= %d;\n", | |
| 626 | + "coding_param->iPicWidth= %d;coding_param->iPicHeight= %d;coding_param->iTargetBitrate= %d; coding_param->iMaxBitrate= %d; coding_param->iRCMode= %d;coding_param->iPaddingFlag= %d;coding_param->iTemporalLayerNum= %d;coding_param->iSpatialLayerNum= %d;coding_param->fFrameRate= %.6ff;coding_param->iInputCsp= %d;coding_param->uiIntraPeriod= %d;coding_param->bEnableSpsPpsIdAddition = %d;coding_param->bPrefixNalAddingCtrl = %d;coding_param->bEnableDenoise= %d;coding_param->bEnableBackgroundDetection= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableAdaptiveQuant= %d;coding_param->bEnableLongTermReference= %d;coding_param->iLtrMarkPeriod= %d;\n", | |
| 627 | 627 | sEncodingParam.iPicWidth, |
| 628 | 628 | sEncodingParam.iPicHeight, |
| 629 | 629 | sEncodingParam.iTargetBitrate, |
| 630 | + sEncodingParam.iMaxBitrate, | |
| 630 | 631 | sEncodingParam.iRCMode, |
| 631 | 632 | sEncodingParam.iPaddingFlag, |
| 632 | 633 | sEncodingParam.iTemporalLayerNum, |
| @@ -646,11 +647,12 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 13 unmodified lines | ||
| 646 | 647 | while (i < sEncodingParam.iSpatialLayerNum) { |
| 647 | 648 | SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i]; |
| 648 | 649 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 649 | − "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", | |
| 650 | + "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", | |
| 650 | 651 | i, pSpatialCfg->iVideoWidth, |
| 651 | 652 | pSpatialCfg->iVideoHeight, |
| 652 | 653 | pSpatialCfg->fFrameRate, |
| 653 | 654 | pSpatialCfg->iSpatialBitrate, |
| 655 | + pSpatialCfg->iMaxSpatialBitrate, | |
| 654 | 656 | pSpatialCfg->sSliceCfg.uiSliceMode, |
| 655 | 657 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceNum, |
| 656 | 658 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint |