[x265] [PATCH 1/1] Set tuQTMaxLog2Size to MIN(5, maxLog2CUSize)

[Nicolas Morey-Chaisemartin]

On 10/28/2014 02:24 AM, Steve Borho wrote:
> if --ctu 16 is used, then the max TU size is actually 4. I think it
> would be more correct as: X265_MIN(g_maxLog2CUSize, 5);
My bad, I queued the wrong patch version...
>
>>       sps->quadtreeTULog2MinSize = 2;
>>       sps->quadtreeTUMaxDepthInter = m_param->tuQTMaxInterDepth;
>>       sps->quadtreeTUMaxDepthIntra = m_param->tuQTMaxIntraDepth;
>> diff --git a/source/encoder/search.cpp b/source/encoder/search.cpp
>> index 86dea43..4c49f86 100644
>> --- a/source/encoder/search.cpp
>> +++ b/source/encoder/search.cpp
>> @@ -63,7 +63,7 @@ bool Search::initSearch(const x265_param& param, ScalingList& scalingList)
>>       m_param = ¶m;
>>       m_bEnableRDOQ = param.rdLevel >= 4;
>>       m_bFrameParallel = param.frameNumThreads > 1;
>> -    m_numLayers = g_log2Size[param.maxCUSize] - 2;
>> +    m_numLayers = g_log2Size[param.maxCUSize] - 2 + 1;
> queued, but I've made the loops <= m_numLayers instead of adding a magic
> +1 here. This is consistent with the loop over g_maxCUDepth in the same
> function (they might actually be equivalent now)
>

Seems good to me.