Showing the changes to codec/encoder/plus/src/welsEncoderExt.cpp (1 of 1 file). Show all
Unified · Split
| @@ -574,21 +574,16 @@ void CWelsH264SVCEncoder::UpdateStatistics (SFrameBSInfo* pBsInfo, · 573 unmodified lines | ||
| 574 | 574 | int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1; |
| 575 | 575 | SLayerBSInfo* pLayerInfo = &pBsInfo->sLayerInfo[0]; |
| 576 | 576 | for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) { |
| 577 | − EVideoFrameType eFrameType = pBsInfo->eFrameType; | |
| 577 | + EVideoFrameType eFrameType = videoFrameTypeSkip; | |
| 578 | 578 | int32_t kiCurrentFrameSize = 0; |
| 579 | − if (pBsInfo->eFrameType == videoFrameTypeSkip) { | |
| 580 | − eFrameType = videoFrameTypeSkip; | |
| 581 | − } else { | |
| 582 | − for (int32_t iLayerNum = 0; iLayerNum < pBsInfo->iLayerNum; iLayerNum++) { | |
| 583 | − pLayerInfo = &pBsInfo->sLayerInfo[iLayerNum]; | |
| 584 | − if ((pLayerInfo->uiLayerType == VIDEO_CODING_LAYER) && (pLayerInfo->uiSpatialId == iDid)) { | |
| 585 | − eFrameType = pLayerInfo->eFrameType; | |
| 586 | − for (int32_t iNalIdx = 0; iNalIdx < pLayerInfo->iNalCount; iNalIdx++) { | |
| 587 | − kiCurrentFrameSize += pLayerInfo->pNalLengthInByte[iNalIdx]; | |
| 588 | − } | |
| 579 | + for (int32_t iLayerNum = 0; iLayerNum < pBsInfo->iLayerNum; iLayerNum++) { | |
| 580 | + pLayerInfo = &pBsInfo->sLayerInfo[iLayerNum]; | |
| 581 | + if ((pLayerInfo->uiLayerType == VIDEO_CODING_LAYER) && (pLayerInfo->uiSpatialId == iDid)) { | |
| 582 | + eFrameType = pLayerInfo->eFrameType; | |
| 583 | + for (int32_t iNalIdx = 0; iNalIdx < pLayerInfo->iNalCount; iNalIdx++) { | |
| 584 | + kiCurrentFrameSize += pLayerInfo->pNalLengthInByte[iNalIdx]; | |
| 589 | 585 | } |
| 590 | 586 | } |
| 591 | − | |
| 592 | 587 | } |
| 593 | 588 | SEncoderStatistics* pStatistics = & (m_pEncContext->sEncoderStatistics[iDid]); |
| 594 | 589 | |
| @@ -1065,7 +1060,8 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 470 unmodified lines | ||
| 1065 | 1060 | if (m_pWelsTrace) { |
| 1066 | 1061 | WelsTraceCallback callback = * ((WelsTraceCallback*)pOption); |
| 1067 | 1062 | m_pWelsTrace->SetTraceCallback (callback); |
| 1068 | − WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_TRACE_CALLBACK callback = %p.", | |
| 1063 | + WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, | |
| 1064 | + "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_TRACE_CALLBACK callback = %p.", | |
| 1069 | 1065 | callback); |
| 1070 | 1066 | } |
| 1071 | 1067 | } |