Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -866,10 +866,6 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { · 865 unmodified lines | |||
| 866 | pDqLayer->iLoopFilterDisableIdc = pParam->iLoopFilterDisableIdc; | 866 | pDqLayer->iLoopFilterDisableIdc = pParam->iLoopFilterDisableIdc; |
| 867 | pDqLayer->iLoopFilterAlphaC0Offset = (pParam->iLoopFilterAlphaC0Offset) << 1; | 867 | pDqLayer->iLoopFilterAlphaC0Offset = (pParam->iLoopFilterAlphaC0Offset) << 1; |
| 868 | pDqLayer->iLoopFilterBetaOffset = (pParam->iLoopFilterBetaOffset) << 1; | 868 | pDqLayer->iLoopFilterBetaOffset = (pParam->iLoopFilterBetaOffset) << 1; |
| 869 | //inter-layer deblocking | ||
| 870 | pDqLayer->uiDisableInterLayerDeblockingFilterIdc = pParam->iInterLayerLoopFilterDisableIdc; | ||
| 871 | pDqLayer->iInterLayerSliceAlphaC0Offset = (pParam->iInterLayerLoopFilterAlphaC0Offset) << 1; | ||
| 872 | pDqLayer->iInterLayerSliceBetaOffset = (pParam->iInterLayerLoopFilterBetaOffset) << 1; | ||
| 873 | //parallel deblocking | 869 | //parallel deblocking |
| 874 | pDqLayer->bDeblockingParallelFlag = pParam->bDeblockingParallelFlag; | 870 | pDqLayer->bDeblockingParallelFlag = pParam->bDeblockingParallelFlag; |
| 875 | 871 | ||
| @@ -3710,9 +3706,6 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 2834 unmodified lines | |||
| 3710 | pNewParam->iLoopFilterDisableIdc = WELS_CLIP3 (pNewParam->iLoopFilterDisableIdc, 0, 6); | 3706 | pNewParam->iLoopFilterDisableIdc = WELS_CLIP3 (pNewParam->iLoopFilterDisableIdc, 0, 6); |
| 3711 | pNewParam->iLoopFilterAlphaC0Offset = WELS_CLIP3 (pNewParam->iLoopFilterAlphaC0Offset, -6, 6); | 3707 | pNewParam->iLoopFilterAlphaC0Offset = WELS_CLIP3 (pNewParam->iLoopFilterAlphaC0Offset, -6, 6); |
| 3712 | pNewParam->iLoopFilterBetaOffset = WELS_CLIP3 (pNewParam->iLoopFilterBetaOffset, -6, 6); | 3708 | pNewParam->iLoopFilterBetaOffset = WELS_CLIP3 (pNewParam->iLoopFilterBetaOffset, -6, 6); |
| 3713 | pNewParam->iInterLayerLoopFilterDisableIdc = WELS_CLIP3 (pNewParam->iInterLayerLoopFilterDisableIdc, 0, 6); | ||
| 3714 | pNewParam->iInterLayerLoopFilterAlphaC0Offset = WELS_CLIP3 (pNewParam->iInterLayerLoopFilterAlphaC0Offset, -6, 6); | ||
| 3715 | pNewParam->iInterLayerLoopFilterBetaOffset = WELS_CLIP3 (pNewParam->iInterLayerLoopFilterBetaOffset, -6, 6); | ||
| 3716 | pNewParam->fMaxFrameRate = WELS_CLIP3 (pNewParam->fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE); | 3709 | pNewParam->fMaxFrameRate = WELS_CLIP3 (pNewParam->fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE); |
| 3717 | 3710 | ||
| 3718 | // we can not use direct struct based memcpy due some fields need keep unchanged as before | 3711 | // we can not use direct struct based memcpy due some fields need keep unchanged as before |
| @@ -3746,13 +3739,7 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 27 unmodified lines | |||
| 3746 | pOldParam->iLoopFilterDisableIdc = pNewParam->iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries | 3739 | pOldParam->iLoopFilterDisableIdc = pNewParam->iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries |
| 3747 | pOldParam->iLoopFilterAlphaC0Offset = pNewParam->iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0 | 3740 | pOldParam->iLoopFilterAlphaC0Offset = pNewParam->iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0 |
| 3748 | pOldParam->iLoopFilterBetaOffset = pNewParam->iLoopFilterBetaOffset; // BetaOffset: valid range [-6, 6], default 0 | 3741 | pOldParam->iLoopFilterBetaOffset = pNewParam->iLoopFilterBetaOffset; // BetaOffset: valid range [-6, 6], default 0 |
| 3749 | pOldParam->iInterLayerLoopFilterDisableIdc = | 3742 | |
| 3750 | pNewParam->iInterLayerLoopFilterDisableIdc; // Employed based upon inter-layer, same comment as above | ||
| 3751 | pOldParam->iInterLayerLoopFilterAlphaC0Offset = | ||
| 3752 | pNewParam->iInterLayerLoopFilterAlphaC0Offset; // InterLayerLoopFilterAlphaC0Offset | ||
| 3753 | pOldParam->iInterLayerLoopFilterBetaOffset = | ||
| 3754 | pNewParam->iInterLayerLoopFilterBetaOffset; // InterLayerLoopFilterBetaOffset | ||
| 3755 | |||
| 3756 | /* Rate Control */ | 3743 | /* Rate Control */ |
| 3757 | pOldParam->bEnableRc = pNewParam->bEnableRc; | 3744 | pOldParam->bEnableRc = pNewParam->bEnableRc; |
| 3758 | pOldParam->iRCMode = pNewParam->iRCMode; | 3745 | pOldParam->iRCMode = pNewParam->iRCMode; |