commit e8032a5fae496902322ecac373ef8be5477fca0c
author Shunyao Li <shunyaoli@google.com> Tue Aug 25 16:51:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 25 16:51:04 2015 +0000
tree 845741d856f3a358843dbd68a638657c0a5a799f
parent 071b781e37c75dade63fcfefa0627b2a39ef0cf6
parent aa006d714998ba043052b9c506a8b22afa61ac70

Merge "Add transform size rate for intra skip mode in rdopt"

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 4d8ff57..6cb2ff5 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -217,7 +217,7 @@
           return;
       }
     } else {
-#else  // CONFIG_VP9_HIGHBITDEPTH
+#endif  // CONFIG_VP9_HIGHBITDEPTH
       switch (tx_size) {
         case TX_4X4:
           vp10_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, tx_type,
@@ -237,7 +237,6 @@
           assert(0 && "Invalid transform size");
           return;
       }
-#endif  // CONFIG_VP9_HIGHBITDEPTH
 #if CONFIG_VP9_HIGHBITDEPTH
     }
 #endif  // CONFIG_VP9_HIGHBITDEPTH
@@ -289,7 +288,7 @@
           return;
       }
     } else {
-#else  // CONFIG_VP9_HIGHBITDEPTH
+#endif  // CONFIG_VP9_HIGHBITDEPTH
       switch (tx_size) {
         case TX_4X4:
           vp10_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, tx_type,
@@ -309,7 +308,6 @@
           assert(0 && "Invalid transform size");
           return;
       }
-#endif  // CONFIG_VP9_HIGHBITDEPTH
 #if CONFIG_VP9_HIGHBITDEPTH
     }
 #endif  // CONFIG_VP9_HIGHBITDEPTH

vp9/encoder/vp9_svc_layercontext.c

diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index 38a3278..e69404a 100644
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -15,7 +15,7 @@
 #include "vp9/encoder/vp9_extend.h"
 
 #define SMALL_FRAME_FB_IDX 7
-#define SMALL_FRAME_WIDTH  16
+#define SMALL_FRAME_WIDTH  32
 #define SMALL_FRAME_HEIGHT 16
 
 void vp9_init_layer_context(VP9_COMP *const cpi) {