commit 4e86937078ff703da1432bff6d7819885bc028d2
author Marco Paniconi <marpan@google.com> Tue Jun 23 10:22:50 2020 -0700
committer Marco Paniconi <marpan@google.com> Tue Jun 23 21:17:04 2020 +0000
tree d0f1b886d7c7ca7f8d5bb4be0a8ea6025828e188
parent 7b9b739857bb792d724249be43f8403987703d66

Add more scaling modes for AOME_SET_SCALEMODE

Add 1/4,3/4,1/8 to aom_scaling_mode_1d

Change-Id: Ia493cd3c4676cf35fed733107d4d14a16dc56f5e

aom/aomcx.h

diff --git a/aom/aomcx.h b/aom/aomcx.h
index fc42243..a76ec3a 100644
--- a/aom/aomcx.h
+++ b/aom/aomcx.h
@@ -1279,7 +1279,10 @@
   AOME_NORMAL = 0,
   AOME_FOURFIVE = 1,
   AOME_THREEFIVE = 2,
-  AOME_ONETWO = 3
+  AOME_THREEFOUR = 3,
+  AOME_ONEFOUR = 4,
+  AOME_ONEEIGHT = 5,
+  AOME_ONETWO = 6
 } AOM_SCALING_MODE;
 
 /*!\brief Max number of segments

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index afdb991..872a4e5 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -110,6 +110,18 @@
       *hr = 3;
       *hs = 5;
       break;
+    case THREEFOUR:
+      *hr = 3;
+      *hs = 4;
+      break;
+    case ONEFOUR:
+      *hr = 1;
+      *hs = 4;
+      break;
+    case ONEEIGHT:
+      *hr = 1;
+      *hs = 8;
+      break;
     case ONETWO:
       *hr = 1;
       *hs = 2;

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 0b4a8c7..04f4e2d 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -91,7 +91,10 @@
   NORMAL = 0,
   FOURFIVE = 1,
   THREEFIVE = 2,
-  ONETWO = 3
+  THREEFOUR = 3,
+  ONEFOUR = 4,
+  ONEEIGHT = 5,
+  ONETWO = 6
 } UENUM1BYTE(AOM_SCALING);
 
 enum {