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 | int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1; | 574 | int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1; |
| 575 | SLayerBSInfo* pLayerInfo = &pBsInfo->sLayerInfo[0]; | 575 | SLayerBSInfo* pLayerInfo = &pBsInfo->sLayerInfo[0]; |
| 576 | for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) { | 576 | for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) { |
| 577 | EVideoFrameType eFrameType = pBsInfo->eFrameType; | 577 | EVideoFrameType eFrameType = videoFrameTypeSkip; |
| 578 | int32_t kiCurrentFrameSize = 0; | 578 | int32_t kiCurrentFrameSize = 0; |
| 579 | if (pBsInfo->eFrameType == videoFrameTypeSkip) { | 579 | for (int32_t iLayerNum = 0; iLayerNum < pBsInfo->iLayerNum; iLayerNum++) { |
| 580 | eFrameType = videoFrameTypeSkip; | 580 | pLayerInfo = &pBsInfo->sLayerInfo[iLayerNum]; |
| 581 | } else { | 581 | if ((pLayerInfo->uiLayerType == VIDEO_CODING_LAYER) && (pLayerInfo->uiSpatialId == iDid)) { |
| 582 | for (int32_t iLayerNum = 0; iLayerNum < pBsInfo->iLayerNum; iLayerNum++) { | 582 | eFrameType = pLayerInfo->eFrameType; |
| 583 | pLayerInfo = &pBsInfo->sLayerInfo[iLayerNum]; | 583 | for (int32_t iNalIdx = 0; iNalIdx < pLayerInfo->iNalCount; iNalIdx++) { |
| 584 | if ((pLayerInfo->uiLayerType == VIDEO_CODING_LAYER) && (pLayerInfo->uiSpatialId == iDid)) { | 584 | kiCurrentFrameSize += pLayerInfo->pNalLengthInByte[iNalIdx]; |
| 585 | eFrameType = pLayerInfo->eFrameType; | ||
| 586 | for (int32_t iNalIdx = 0; iNalIdx < pLayerInfo->iNalCount; iNalIdx++) { | ||
| 587 | kiCurrentFrameSize += pLayerInfo->pNalLengthInByte[iNalIdx]; | ||
| 588 | } | ||
| 589 | } | 585 | } |
| 590 | } | 586 | } |
| 591 | |||
| 592 | } | 587 | } |
| 593 | SEncoderStatistics* pStatistics = & (m_pEncContext->sEncoderStatistics[iDid]); | 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 | if (m_pWelsTrace) { | 1060 | if (m_pWelsTrace) { |
| 1066 | WelsTraceCallback callback = * ((WelsTraceCallback*)pOption); | 1061 | WelsTraceCallback callback = * ((WelsTraceCallback*)pOption); |
| 1067 | m_pWelsTrace->SetTraceCallback (callback); | 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 | callback); | 1065 | callback); |
| 1070 | } | 1066 | } |
| 1071 | } | 1067 | } |