Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 3 files). Show all
Unified · Split
| @@ -374,14 +374,18 @@ int32_t CWelsH264SVCEncoder::Uninitialize() { · 373 unmodified lines | |||
| 374 | */ | 374 | */ |
| 375 | int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { | 375 | int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) { |
| 376 | if (! (kpSrcPic && m_bInitialFlag && pBsInfo)) { | 376 | if (! (kpSrcPic && m_bInitialFlag && pBsInfo)) { |
| 377 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), cmInitParaError."); | ||
| 377 | return cmInitParaError; | 378 | return cmInitParaError; |
| 378 | } | 379 | } |
| 379 | if (kpSrcPic->iColorFormat != videoFormatI420) | 380 | if (kpSrcPic->iColorFormat != videoFormatI420) { |
| 381 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), wrong iColorFormat %d", kpSrcPic->iColorFormat); | ||
| 380 | return cmInitParaError; | 382 | return cmInitParaError; |
| 383 | } | ||
| 381 | 384 | ||
| 382 | const int32_t kiEncoderReturn = EncodeFrameInternal (kpSrcPic, pBsInfo); | 385 | const int32_t kiEncoderReturn = EncodeFrameInternal (kpSrcPic, pBsInfo); |
| 383 | 386 | ||
| 384 | if (kiEncoderReturn != cmResultSuccess) { | 387 | if (kiEncoderReturn != cmResultSuccess) { |
| 388 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), kiEncoderReturn %d", kiEncoderReturn); | ||
| 385 | return kiEncoderReturn; | 389 | return kiEncoderReturn; |
| 386 | } | 390 | } |
| 387 | 391 | ||
| @@ -539,7 +543,7 @@ void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) { · 151 unmodified lines | |||
| 539 | SSpatialLayerConfig* pSpatialCfg = &pParam->sSpatialLayers[i]; | 543 | SSpatialLayerConfig* pSpatialCfg = &pParam->sSpatialLayers[i]; |
| 540 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, | 544 | WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, |
| 541 | "sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceArgument.uiSliceMode= %d; .sSliceArgument.iSliceNum= %d; .sSliceArgument.uiSliceSizeConstraint= %d;" | 545 | "sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceArgument.uiSliceMode= %d; .sSliceArgument.iSliceNum= %d; .sSliceArgument.uiSliceSizeConstraint= %d;" |
| 542 | "uiProfileIdc = %d;uiLevelIdc = %d", | 546 | "uiProfileIdc = %d;uiLevelIdc = %d;iDLayerQp = %d", |
| 543 | i, pSpatialCfg->iVideoWidth, | 547 | i, pSpatialCfg->iVideoWidth, |
| 544 | pSpatialCfg->iVideoHeight, | 548 | pSpatialCfg->iVideoHeight, |
| 545 | pSpatialCfg->fFrameRate, | 549 | pSpatialCfg->fFrameRate, |
| @@ -549,7 +553,8 @@ void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) { · 3 unmodified lines | |||
| 549 | pSpatialCfg->sSliceArgument.uiSliceNum, | 553 | pSpatialCfg->sSliceArgument.uiSliceNum, |
| 550 | pSpatialCfg->sSliceArgument.uiSliceSizeConstraint, | 554 | pSpatialCfg->sSliceArgument.uiSliceSizeConstraint, |
| 551 | pSpatialCfg->uiProfileIdc, | 555 | pSpatialCfg->uiProfileIdc, |
| 552 | pSpatialCfg->uiLevelIdc | 556 | pSpatialCfg->uiLevelIdc, |
| 557 | pSpatialCfg->iDLayerQp | ||
| 553 | ); | 558 | ); |
| 554 | ++ i; | 559 | ++ i; |
| 555 | } | 560 | } |