shithub: libvpx

Info  •  Files  •  Log  •  Branches

Make cat6 probs properly dependent on CONFIG_EXTEND_QRANGE

Change-Id: I2ac5d8818acb50f9db38de8cb562f337e51006b2

--- a/vp8/decoder/detokenize.c

+++ b/vp8/decoder/detokenize.c

@@ -64,10 +64,14 @@

 #define CAT5_PROB3 157

 #define CAT5_PROB4 180

+#if CONFIG_EXTEND_QRANGE

 static const unsigned char cat6_prob[14] =

 { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254, 0 };

+#else

+static const unsigned char cat6_prob[12] =

+{ 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 };

+#endif

-

 void vp8_reset_mb_tokens_context(MACROBLOCKD *x)

 {

     /* Clear entropy contexts for Y2 blocks */

@@ -271,7 +275,7 @@

                               CAT_FIVE_CONTEXT_NODE_0_);

     val = CAT6_MIN_VAL;

-    bits_count = 12;

+    bits_count = CONFIG_EXTEND_QRANGE?12:10;

     do

     {

-- 

⑨