[x265] [PATCH x265] Support scale factor with analysis-reuse-level 1-6

[bhavna]

# HG changeset patch
# User Bhavna Hariharan <bha...@multicorewareinc.com>
# Date 1527756919 -19800
#      Thu May 31 14:25:19 2018 +0530
# Node ID d939297a02c72cad0d860234f31a356eb30aa9f4
# Parent  9cde2c278464be0db96d41f9605a2dc7a3137165
Support scale factor with analysis-reuse-level 1-6

diff -r 9cde2c278464 -r d939297a02c7 doc/reST/cli.rst
--- a/doc/reST/cli.rst  Wed May 30 20:54:07 2018 +0530
+++ b/doc/reST/cli.rst  Thu May 31 14:25:19 2018 +0530
@@ -895,11 +895,11 @@
     +--------------+------------------------------------------+
     | 2 to 4       | Level 1 + intra/inter modes, ref's       |
     +--------------+------------------------------------------+
-    | 5,6 and 9    | Level 2 + rect-amp                       |
+    | 5 and 6      | Level 2 + rect-amp                       |
     +--------------+------------------------------------------+
     | 7            | Level 5 + AVC size CU refinement         |
     +--------------+------------------------------------------+
-    | 8            | Level 5 + AVC size Full CU analysis-info |
+    | 8 and 9      | Level 5 + AVC size Full CU analysis-info |
     +--------------+------------------------------------------+
     | 10           | Level 5 + Full CU analysis-info          |
     +--------------+------------------------------------------+
diff -r 9cde2c278464 -r d939297a02c7 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp        Wed May 30 20:54:07 2018 +0530
+++ b/source/encoder/encoder.cpp        Thu May 31 14:25:19 2018 +0530
@@ -2711,9 +2711,9 @@
         {
             p->scaleFactor = 0;
         }
-        else if ((!p->analysisLoad && !p->analysisSave) || 
p->analysisReuseLevel < 10)
+        else if ((!p->analysisLoad && !p->analysisSave) || 
(p->analysisReuseLevel > 6 && p->analysisReuseLevel != 10))
         {
-            x265_log(p, X265_LOG_WARNING, "Input scaling works with analysis 
load/save, analysis-reuse-level 10. Disabling scale-factor.\n");
+            x265_log(p, X265_LOG_WARNING, "Input scaling works with analysis 
load/save and analysis-reuse-level 1-6 and 10. Disabling scale-factor.\n");
             p->scaleFactor = 0;
         }
     }
@@ -2749,9 +2749,9 @@
             p->interRefine = 0;
         }
     }
-    if (p->scaleFactor && p->analysisLoad && !p->interRefine && 
!p->bDynamicRefine)
+    if (p->scaleFactor && p->analysisLoad && !p->interRefine && 
!p->bDynamicRefine && p->analysisReuseLevel == 10)
     {
-        x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported 
with scaling. Enabling refine-inter 1.\n");
+        x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported 
with scaling and analysis-reuse-level=10. Enabling refine-inter 1.\n");
         p->interRefine = 1;
     }
 

# HG changeset patch
# User Bhavna Hariharan <bha...@multicorewareinc.com>
# Date 1527756919 -19800
#      Thu May 31 14:25:19 2018 +0530
# Node ID d939297a02c72cad0d860234f31a356eb30aa9f4
# Parent  9cde2c278464be0db96d41f9605a2dc7a3137165
Support scale factor with analysis-reuse-level 1-6

diff -r 9cde2c278464 -r d939297a02c7 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Wed May 30 20:54:07 2018 +0530
+++ b/doc/reST/cli.rst	Thu May 31 14:25:19 2018 +0530
@@ -895,11 +895,11 @@
     +--------------+------------------------------------------+
     | 2 to 4       | Level 1 + intra/inter modes, ref's       |
     +--------------+------------------------------------------+
-    | 5,6 and 9    | Level 2 + rect-amp                       |
+    | 5 and 6      | Level 2 + rect-amp                       |
     +--------------+------------------------------------------+
     | 7            | Level 5 + AVC size CU refinement         |
     +--------------+------------------------------------------+
-    | 8            | Level 5 + AVC size Full CU analysis-info |
+    | 8 and 9      | Level 5 + AVC size Full CU analysis-info |
     +--------------+------------------------------------------+
     | 10           | Level 5 + Full CU analysis-info          |
     +--------------+------------------------------------------+
diff -r 9cde2c278464 -r d939297a02c7 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Wed May 30 20:54:07 2018 +0530
+++ b/source/encoder/encoder.cpp	Thu May 31 14:25:19 2018 +0530
@@ -2711,9 +2711,9 @@
         {
             p->scaleFactor = 0;
         }
-        else if ((!p->analysisLoad && !p->analysisSave) || p->analysisReuseLevel < 10)
+        else if ((!p->analysisLoad && !p->analysisSave) || (p->analysisReuseLevel > 6 && p->analysisReuseLevel != 10))
         {
-            x265_log(p, X265_LOG_WARNING, "Input scaling works with analysis load/save, analysis-reuse-level 10. Disabling scale-factor.\n");
+            x265_log(p, X265_LOG_WARNING, "Input scaling works with analysis load/save and analysis-reuse-level 1-6 and 10. Disabling scale-factor.\n");
             p->scaleFactor = 0;
         }
     }
@@ -2749,9 +2749,9 @@
             p->interRefine = 0;
         }
     }
-    if (p->scaleFactor && p->analysisLoad && !p->interRefine && !p->bDynamicRefine)
+    if (p->scaleFactor && p->analysisLoad && !p->interRefine && !p->bDynamicRefine && p->analysisReuseLevel == 10)
     {
-        x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported with scaling. Enabling refine-inter 1.\n");
+        x265_log(p, X265_LOG_WARNING, "Inter refinement 0 is not supported with scaling and analysis-reuse-level=10. Enabling refine-inter 1.\n");
         p->interRefine = 1;
     }
 

_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel