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

[Mahesh Pittala]

>From d6025f47a444aed2906c5f6cf293e017410d0808 Mon Sep 17 00:00:00 2001
From: Mahesh Pittala <mahesh at multicorewareinc.com>
Date: Wed, 9 Sep 2020 15:02:09 +0530
Subject: [PATCH] analysis-save/load: Enable reuse of cutree info in
 reuse-levels >= 2

---
 source/encoder/analysis.cpp | 2 +-
 source/encoder/encoder.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/encoder/analysis.cpp b/source/encoder/analysis.cpp
index 157bae8..aabf386 100644
--- 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
index cf7bfb9..1f710e1 100644
--- 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;
-- 
1.8.3.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20200909/69095172/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-analysis-save-load-Enable-reuse-of-cutree-info-in-re.patch
Type: application/octet-stream
Size: 1697 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20200909/69095172/attachment.obj>