Respect the loop filter disabling encoder parameter

Previously the loop filter was unconditionally enabled
regardless of what encoder parameter was set. If using
SEncParamBase instead, the loop filter was always disabled.
This commit is contained in:
Martin Storsjö 2014-02-22 23:31:13 +02:00
parent 8b7fb36f39
commit 08c07db3c6

View File

@ -302,10 +302,10 @@ int32_t ParamTranscode (const SEncParamExt& pCodingParam) {
SUsedPicRect.iHeight = ((iPicHeight >> 1) << 1); SUsedPicRect.iHeight = ((iPicHeight >> 1) << 1);
/* Deblocking loop filter */ /* Deblocking loop filter */
iLoopFilterDisableIdc = pCodingParam.iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries,
#ifdef MT_ENABLED #ifdef MT_ENABLED
iLoopFilterDisableIdc = 2;//pCodingParam.iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries, if (iLoopFilterDisableIdc == 0) // Loop filter requested to be enabled
#else iLoopFilterDisableIdc = 2; // Disable loop filter on slice boundaries since that's not possible with multithreading
iLoopFilterDisableIdc = 0; // 0: on, 1: off, 2: on except for slice boundaries
#endif #endif
iLoopFilterAlphaC0Offset = 0; // AlphaOffset: valid range [-6, 6], default 0 iLoopFilterAlphaC0Offset = 0; // AlphaOffset: valid range [-6, 6], default 0
iLoopFilterBetaOffset = 0; // BetaOffset: valid range [-6, 6], default 0 iLoopFilterBetaOffset = 0; // BetaOffset: valid range [-6, 6], default 0