analysis-save/load: Enable reuse of cutree info in reuse-levels >= 2

lawchingman · Sep 14, 2020 · 83e2d7f · 83e2d7f
1 parent 0d4cb40
commit 83e2d7f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions .
diff --git a/source/encoder/analysis.cpp b/source/encoder/analysis.cpp
@@ -3645,7 +3645,7 @@ int Analysis::calculateQpforCuSize(const CUData& ctu, const CUGeom& cuGeom, int3
             qp += distortionData->
offset
[ctu.
m_cuAddr
];
     }
 
-    if
 (m_param->
analysisLoadReuseLevel
 == 
10
 && m_param->
rc
.
cuTree
)
+    if
 (m_param->
analysisLoadReuseLevel
 >= 
2
 && m_param->
rc
.
cuTree
)
     {
         int
 cuIdx = (ctu.
m_cuAddr
 * ctu.
m_numPartitions
) + cuGeom.
absPartIdx
;
         if
 (ctu.
m_slice
->
m_sliceType
 == I_SLICE)

diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
@@ -5167,7 +5167,7 @@ int Encoder::validateAnalysisData(x265_analysis_validate* saveParam, int writeFl
 
         int
 bcutree;
         X265_FREAD
(&bcutree, 
sizeof
(
int
), 
1
, m_analysisFileIn, &(saveParam->
cuTree
));
-        if
 (loadLevel 
== 
10
 && m_param->
rc
.
cuTree
 && (!bcutree || saveLevel < 
2
))
+        if
 (loadLevel 
>= 
2
 && m_param->
rc
.
cuTree
 && (!bcutree || saveLevel < 
2
))
         {
             x265_log
(
NULL
, X265_LOG_ERROR, 
"
Error reading cu-tree info. Disabling cutree offsets. 
\n
"
);
             m_param->
rc
.
cuTree
 = 
0
;