Showing the changes to codec/encoder/core (2 of 4 files). Show all
Unified · Split
| @@ -108,7 +108,7 @@ int32_t ForceCodingIDR (sWelsEncCtx* pCtx); · 107 unmodified lines | |||
| 108 | int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNew); | 108 | int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNew); |
| 109 | void WelsEncoderApplyFrameRate (SWelsSvcCodingParam* pParam); | 109 | void WelsEncoderApplyFrameRate (SWelsSvcCodingParam* pParam); |
| 110 | void WelsEncoderApplyBitRate (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer); | 110 | void WelsEncoderApplyBitRate (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer); |
| 111 | void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx*pCtx,SLTRConfig* pLTRValue); | 111 | void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue); |
| 112 | int32_t FilterLTRRecoveryRequest (sWelsEncCtx* pCtx, SLTRRecoverRequest* pLTRRecoverRequest); | 112 | int32_t FilterLTRRecoveryRequest (sWelsEncCtx* pCtx, SLTRRecoverRequest* pLTRRecoverRequest); |
| 113 | 113 | ||
| 114 | void FilterLTRMarkingFeedback (sWelsEncCtx* pCtx, SLTRMarkingFeedback* pLTRMarkingFeedback); | 114 | void FilterLTRMarkingFeedback (sWelsEncCtx* pCtx, SLTRMarkingFeedback* pLTRMarkingFeedback); |
| @@ -3825,10 +3825,10 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 3824 unmodified lines | |||
| 3825 | return 0; | 3825 | return 0; |
| 3826 | } | 3826 | } |
| 3827 | 3827 | ||
| 3828 | void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx* pCtx, SLTRConfig* pLTRValue) { | 3828 | void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue) { |
| 3829 | SWelsSvcCodingParam sConfig; | 3829 | SWelsSvcCodingParam sConfig; |
| 3830 | int32_t iNumRefFrame = 1; | 3830 | int32_t iNumRefFrame = 1; |
| 3831 | memcpy (&sConfig, pCtx->pSvcParam, sizeof (SWelsSvcCodingParam)); | 3831 | memcpy (&sConfig, (*ppCtx)->pSvcParam, sizeof (SWelsSvcCodingParam)); |
| 3832 | sConfig.bEnableLongTermReference = pLTRValue->bEnableLongTermReference; | 3832 | sConfig.bEnableLongTermReference = pLTRValue->bEnableLongTermReference; |
| 3833 | sConfig.iLTRRefNum = pLTRValue->iLTRRefNum; | 3833 | sConfig.iLTRRefNum = pLTRValue->iLTRRefNum; |
| 3834 | int32_t uiGopSize = 1 << (sConfig.iTemporalLayerNum - 1); | 3834 | int32_t uiGopSize = 1 << (sConfig.iTemporalLayerNum - 1); |
| @@ -3856,9 +3856,9 @@ void WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx* pCtx, SLTRConfig* p · 21 unmodified lines | |||
| 3856 | if (sConfig.iNumRefFrame > sConfig.iMaxNumRefFrame) | 3856 | if (sConfig.iNumRefFrame > sConfig.iMaxNumRefFrame) |
| 3857 | sConfig.iMaxNumRefFrame = sConfig.iNumRefFrame; | 3857 | sConfig.iMaxNumRefFrame = sConfig.iNumRefFrame; |
| 3858 | 3858 | ||
| 3859 | WelsLog (pLogCtx, WELS_LOG_WARNING, " CWelsH264SVCEncoder::SetOption enable LTR = %d,ltrnum = %d", | 3859 | WelsLog (pLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable LTR = %d,ltrnum = %d", |
| 3860 | sConfig.bEnableLongTermReference, sConfig.iLTRRefNum); | 3860 | sConfig.bEnableLongTermReference, sConfig.iLTRRefNum); |
| 3861 | WelsEncoderParamAdjust (&pCtx, &sConfig); | 3861 | WelsEncoderParamAdjust (ppCtx, &sConfig); |
| 3862 | } | 3862 | } |
| 3863 | int32_t DynSliceRealloc (sWelsEncCtx* pCtx, | 3863 | int32_t DynSliceRealloc (sWelsEncCtx* pCtx, |
| 3864 | SFrameBSInfo* pFrameBsInfo, | 3864 | SFrameBSInfo* pFrameBsInfo, |