shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge remote branch 'internal/upstream-experimental' into HEAD

--- a/vp8/common/entropy.c

+++ b/vp8/common/entropy.c

@@ -68,7 +68,7 @@

 static const Prob Pcat4[] = { 176, 155, 140, 135};

 static const Prob Pcat5[] = { 180, 157, 141, 134, 130};

 static const Prob Pcat6[] =

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

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

 static vp8_tree_index cat1[2], cat2[4], cat3[6], cat4[8], cat5[10], cat6[22];

@@ -103,7 +103,7 @@

     init_bit_tree(cat3, 3);

     init_bit_tree(cat4, 4);

     init_bit_tree(cat5, 5);

-    init_bit_tree(cat6, 11);

+    init_bit_tree(cat6, 13);

 }

@@ -121,7 +121,7 @@

     { cat3, Pcat3, bcc3, 3, 11},

     { cat4, Pcat4, bcc4, 4, 19},

     { cat5, Pcat5, bcc5, 5, 35},

-    { cat6, Pcat6, bcc6, 11, 67},

+    { cat6, Pcat6, bcc6, 13, 67},

     { 0, 0, 0, 0, 0}

 };

 #include "defaultcoefcounts.h"

--- a/vp8/common/entropy.h

+++ b/vp8/common/entropy.h

@@ -27,7 +27,7 @@

 #define DCT_VAL_CATEGORY3       7       /* 11-18     Extra Bits 3+1 */

 #define DCT_VAL_CATEGORY4       8       /* 19-34     Extra Bits 4+1 */

 #define DCT_VAL_CATEGORY5       9       /* 35-66     Extra Bits 5+1 */

-#define DCT_VAL_CATEGORY6       10      /* 67+       Extra Bits 11+1 */

+#define DCT_VAL_CATEGORY6       10      /* 67+       Extra Bits 13+1 */

 #define DCT_EOB_TOKEN           11      /* EOB       Extra Bits 0+0 */

 #define vp8_coef_tokens 12

@@ -52,7 +52,7 @@

 #define PROB_UPDATE_BASELINE_COST   7

 #define MAX_PROB                255

-#define DCT_MAX_VALUE           2048

+#define DCT_MAX_VALUE           8192

 /* Coefficients are predicted via a 3-dimensional probability table. */

--- a/vp8/common/reconintra4x4.c

+++ b/vp8/common/reconintra4x4.c

@@ -81,10 +81,10 @@

     {

         unsigned int ap[4];

-        ap[0] = (top_left  + 2 * Above[0] + Above[1] + 2) >> 2;

-        ap[1] = (Above[0] + 2 * Above[1] + Above[2] + 2) >> 2;

-        ap[2] = (Above[1] + 2 * Above[2] + Above[3] + 2) >> 2;

-        ap[3] = (Above[2] + 2 * Above[3] + Above[4] + 2) >> 2;

+        ap[0] = Above[0];

+        ap[1] = Above[1];

+        ap[2] = Above[2];

+        ap[3] = Above[3];

         for (r = 0; r < 4; r++)

         {

@@ -105,10 +105,10 @@

     {

         unsigned int lp[4];

-        lp[0] = (top_left + 2 * Left[0] + Left[1] + 2) >> 2;

-        lp[1] = (Left[0] + 2 * Left[1] + Left[2] + 2) >> 2;

-        lp[2] = (Left[1] + 2 * Left[2] + Left[3] + 2) >> 2;

-        lp[3] = (Left[2] + 2 * Left[3] + Left[3] + 2) >> 2;

+        lp[0] = Left[0];

+        lp[1] = Left[1];

+        lp[2] = Left[2];

+        lp[3] = Left[3];

         for (r = 0; r < 4; r++)

         {

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

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

@@ -38,23 +38,23 @@

 {

     INT16         min_val;

     INT16         Length;

-    UINT8 Probs[12];

+    UINT8 Probs[14];

 } TOKENEXTRABITS;

 */

 DECLARE_ALIGNED(16, static const TOKENEXTRABITS, vp8d_token_extra_bits2[MAX_ENTROPY_TOKENS]) =

 {

-    {  0, -1, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* ZERO_TOKEN */

-    {  1, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* ONE_TOKEN */

-    {  2, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* TWO_TOKEN */

-    {  3, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* THREE_TOKEN */

-    {  4, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* FOUR_TOKEN */

-    {  5, 0, { 159, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* DCT_VAL_CATEGORY1 */

-    {  7, 1, { 145, 165, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY2 */

-    { 11, 2, { 140, 148, 173, 0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY3 */

-    { 19, 3, { 135, 140, 155, 176, 0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY4 */

-    { 35, 4, { 130, 134, 141, 157, 180, 0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY5 */

-    { 67, 10, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0   } }, /* DCT_VAL_CATEGORY6 */

+    {  0, -1, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* ZERO_TOKEN */

+    {  1, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* ONE_TOKEN */

+    {  2, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* TWO_TOKEN */

+    {  3, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* THREE_TOKEN */

+    {  4, 0, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },   /* FOUR_TOKEN */

+    {  5, 0, { 159, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /* DCT_VAL_CATEGORY1 */

+    {  7, 1, { 145, 165, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY2 */

+    { 11, 2, { 140, 148, 173, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY3 */

+    { 19, 3, { 135, 140, 155, 176, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY4 */

+    { 35, 4, { 130, 134, 141, 157, 180, 0,  0,  0,  0,  0,  0,  0,  0,  0   } }, /* DCT_VAL_CATEGORY5 */

+    { 67, 12, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 249, 252, 254, 254,  0   } }, /* DCT_VAL_CATEGORY6 */

     {  0, -1, { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   } },  /*  EOB TOKEN */

 };

--- a/vp8/decoder/onyxd_int.h

+++ b/vp8/decoder/onyxd_int.h

@@ -41,9 +41,9 @@

 typedef struct

 {

-    INT16         min_val;

-    INT16         Length;

-    UINT8 Probs[12];

+    INT16        min_val;

+    INT16        Length;

+    UINT8 Probs[14];

 } TOKENEXTRABITS;

 typedef struct

--- a/vp8/encoder/psnr.c

+++ b/vp8/encoder/psnr.c

@@ -13,7 +13,7 @@

 #include "math.h"

 #include "systemdependent.h" /* for vp8_clear_system_state() */

-#define MAX_PSNR 60

+#define MAX_PSNR 100

 double vp8_mse2psnr(double Samples, double Peak, double Mse)

 {