History

Merge pull request #342 from volvet/rm-unsupported-para

remove inter spatial layer prediction in parameters

Licai Guo committed 12 years ago

Commit c9a25e92 parents 26b225e f4d88823 files · +3 −11Browse files

Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/plus/src/welsEncoderExt.cpp+2−4
@@ -279,12 +279,11 @@ int CWelsH264SVCEncoder::Initialize2 (SWelsSvcCodingParam* pCfg) { · 278 unmodified lines
279279 while (i < sEncodingParam.iSpatialLayerNum) {
280280 SSpatialLayerConfig* spatial_cfg = &sEncodingParam.sSpatialLayers[i];
281281 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",
283283 i, spatial_cfg->iVideoWidth,
284284 spatial_cfg->iVideoHeight,
285285 spatial_cfg->fFrameRate,
286286 spatial_cfg->iSpatialBitrate,
287− spatial_cfg->iInterSpatialLayerPredFlag,
288287 spatial_cfg->sSliceCfg.uiSliceMode,
289288 spatial_cfg->sSliceCfg.sSliceArgument.uiSliceNum,
290289 spatial_cfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint
@@ -769,12 +768,11 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 478 unmodified lines
769768 while (i < sEncodingParam.iSpatialLayerNum) {
770769 SSpatialLayerConfig* pSpatialCfg = &sEncodingParam.sSpatialLayers[i];
771770 WelsLog (m_pEncContext, WELS_LOG_INFO,
772− "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",
771+ "coding_param->sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .sSliceCfg.uiSliceMode= %d; .sSliceCfg.sSliceArgument.iSliceNum= %d; .sSliceCfg.sSliceArgument.uiSliceSizeConstraint= %d;\n",
773772 i, pSpatialCfg->iVideoWidth,
774773 pSpatialCfg->iVideoHeight,
775774 pSpatialCfg->fFrameRate,
776775 pSpatialCfg->iSpatialBitrate,
777− pSpatialCfg->iInterSpatialLayerPredFlag,
778776 pSpatialCfg->sSliceCfg.uiSliceMode,
779777 pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceNum,
780778 pSpatialCfg->sSliceCfg.sSliceArgument.uiSliceSizeConstraint

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t