Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all
Unified · Split
| @@ -279,12 +279,11 @@ int CWelsH264SVCEncoder::Initialize2 (SWelsSvcCodingParam* pCfg) { · 278 unmodified lines | |||
| 279 | while (i < sEncodingParam.iSpatialLayerNum) { | 279 | while (i < sEncodingParam.iSpatialLayerNum) { |
| 280 | SSpatialLayerConfig* spatial_cfg = &sEncodingParam.sSpatialLayers[i]; | 280 | SSpatialLayerConfig* spatial_cfg = &sEncodingParam.sSpatialLayers[i]; |
| 281 | WelsLog (m_pEncContext, WELS_LOG_INFO, | 281 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 282 | "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", | 282 | "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.uiSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", |
| 283 | i, spatial_cfg->iVideoWidth, | 283 | i, spatial_cfg->iVideoWidth, |
| 284 | spatial_cfg->iVideoHeight, | 284 | spatial_cfg->iVideoHeight, |
| 285 | spatial_cfg->fFrameRate, | 285 | spatial_cfg->fFrameRate, |
| 286 | spatial_cfg->iSpatialBitrate, | 286 | spatial_cfg->iSpatialBitrate, |
| 287 | spatial_cfg->iInterSpatialLayerPredFlag, | ||
| 288 | spatial_cfg->sSliceCfg.uiSliceMode, | 287 | spatial_cfg->sSliceCfg.uiSliceMode, |
| 289 | spatial_cfg->sSliceCfg.sSliceArgument.uiSliceNum, | 288 | spatial_cfg->sSliceCfg.sSliceArgument.uiSliceNum, |
| 290 | spatial_cfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint | 289 | spatial_cfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint |
| @@ -770,12 +769,11 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 479 unmodified lines | |||
| 770 | while (i < sEncodingParam.iSpatialLayerNum) { | 769 | while (i < sEncodingParam.iSpatialLayerNum) { |
| 771 | SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i]; | 770 | SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i]; |
| 772 | WelsLog (m_pEncContext, WELS_LOG_INFO, | 771 | WelsLog (m_pEncContext, WELS_LOG_INFO, |
| 773 | "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", | 772 | "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n", |
| 774 | i, pSpatialCfg->iVideoWidth, | 773 | i, pSpatialCfg->iVideoWidth, |
| 775 | pSpatialCfg->iVideoHeight, | 774 | pSpatialCfg->iVideoHeight, |
| 776 | pSpatialCfg->fFrameRate, | 775 | pSpatialCfg->fFrameRate, |
| 777 | pSpatialCfg->iSpatialBitrate, | 776 | pSpatialCfg->iSpatialBitrate, |
| 778 | pSpatialCfg->iInterSpatialLayerPredFlag, | ||
| 779 | pSpatialCfg->sSliceCfg.uiSliceMode, | 777 | pSpatialCfg->sSliceCfg.uiSliceMode, |
| 780 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceNum, | 778 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceNum, |
| 781 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint | 779 | pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint |