commit 19987dcbfa02c2185a6d126b34f07366085d0905
author Scott LaVarnway <slavarnway@google.com> Tue Aug 16 16:21:21 2011 -0400
committer Scott LaVarnway <slavarnway@google.com> Tue Aug 16 16:21:21 2011 -0400
tree 37c8ab7d854a14cc6fbabfe81f1160cc3b2073ee
parent b84e8f20c3aca0f2a65265cf704cc7c15a2c93d4

Faster vp8_default_coef_probs

Copies from a generated table instead of building the
default coeff probabilities during runtime.

Change-Id: I4d9551ea3a2d7d4a4f7ce9eda006495221a8de50

vp8/common/entropy.c

diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c
index 0eee60e..f3d5a9c 100644
--- a/vp8/common/entropy.c
+++ b/vp8/common/entropy.c
@@ -15,6 +15,7 @@
 #include "string.h"
 #include "blockd.h"
 #include "onyxc_int.h"
+#include "vpx_mem/vpx_mem.h"
 
 #define uchar unsigned char     /* typedefs can clash */
 #define uint  unsigned int
@@ -153,39 +154,15 @@
     { cat6, Pcat6, 11, 67},
     { 0, 0, 0, 0}
 };
-#include "defaultcoefcounts.h"
+
+#include "default_coef_probs.h"
 
 void vp8_default_coef_probs(VP8_COMMON *pc)
 {
-    int h = 0;
-
-    do
-    {
-        int i = 0;
-
-        do
-        {
-            int k = 0;
-
-            do
-            {
-                unsigned int branch_ct [ENTROPY_NODES] [2];
-                vp8_tree_probs_from_distribution(
-                    MAX_ENTROPY_TOKENS, vp8_coef_encodings, vp8_coef_tree,
-                    pc->fc.coef_probs[h][i][k],
-                    branch_ct,
-                    vp8_default_coef_counts[h][i][k],
-                    256, 1);
-
-            }
-            while (++k < PREV_COEF_CONTEXTS);
-        }
-        while (++i < COEF_BANDS);
-    }
-    while (++h < BLOCK_TYPES);
+    vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
+                   sizeof(default_coef_probs));
 }
 
-
 void vp8_coef_tree_initialize()
 {
     init_bit_trees();