ref: 19987dcbfa02c2185a6d126b34f07366085d0905
parent: b84e8f20c3aca0f2a65265cf704cc7c15a2c93d4
author: Scott LaVarnway <slavarnway@google.com>
date: Tue Aug 16 12:21:21 EDT 2011
Faster vp8_default_coef_probs Copies from a generated table instead of building the default coeff probabilities during runtime. Change-Id: I4d9551ea3a2d7d4a4f7ce9eda006495221a8de50
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -186,7 +186,7 @@
void vp8_create_common(VP8_COMMON *oci)
{vp8_machine_specific_config(oci);
- vp8_default_coef_probs(oci);
+
vp8_init_mbmode_probs(oci);
vp8_default_bmode_probs(oci->fc.bmode_prob);
--- /dev/null
+++ b/vp8/common/default_coef_probs.h
@@ -1,0 +1,188 @@
+/*
+ * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+*/
+
+
+/*Generated file, included by entropy.c*/
+
+
+static const vp8_prob default_coef_probs [BLOCK_TYPES]
+ [COEF_BANDS]
+ [PREV_COEF_CONTEXTS]
+ [ENTROPY_NODES] =
+{+ { /* Block Type ( 0 ) */+ { /* Coeff Band ( 0 )*/+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 1 )*/+ { 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 },+ { 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 },+ { 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }+ },
+ { /* Coeff Band ( 2 )*/+ { 1, 98, 248, 255, 236, 226, 255, 255, 128, 128, 128 },+ { 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 },+ { 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 }+ },
+ { /* Coeff Band ( 3 )*/+ { 1, 185, 249, 255, 243, 255, 128, 128, 128, 128, 128 },+ { 184, 150, 247, 255, 236, 224, 128, 128, 128, 128, 128 },+ { 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 4 )*/+ { 1, 101, 251, 255, 241, 255, 128, 128, 128, 128, 128 },+ { 170, 139, 241, 252, 236, 209, 255, 255, 128, 128, 128 },+ { 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 }+ },
+ { /* Coeff Band ( 5 )*/+ { 1, 204, 254, 255, 245, 255, 128, 128, 128, 128, 128 },+ { 207, 160, 250, 255, 238, 128, 128, 128, 128, 128, 128 },+ { 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 6 )*/+ { 1, 152, 252, 255, 240, 255, 128, 128, 128, 128, 128 },+ { 177, 135, 243, 255, 234, 225, 128, 128, 128, 128, 128 },+ { 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 7 )*/+ { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 246, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }+ }
+ },
+ { /* Block Type ( 1 ) */+ { /* Coeff Band ( 0 )*/+ { 198, 35, 237, 223, 193, 187, 162, 160, 145, 155, 62 },+ { 131, 45, 198, 221, 172, 176, 220, 157, 252, 221, 1 },+ { 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 }+ },
+ { /* Coeff Band ( 1 )*/+ { 1, 149, 241, 255, 221, 224, 255, 255, 128, 128, 128 },+ { 184, 141, 234, 253, 222, 220, 255, 199, 128, 128, 128 },+ { 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 }+ },
+ { /* Coeff Band ( 2 )*/+ { 1, 129, 232, 253, 214, 197, 242, 196, 255, 255, 128 },+ { 99, 121, 210, 250, 201, 198, 255, 202, 128, 128, 128 },+ { 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 }+ },
+ { /* Coeff Band ( 3 )*/+ { 1, 200, 246, 255, 234, 255, 128, 128, 128, 128, 128 },+ { 109, 178, 241, 255, 231, 245, 255, 255, 128, 128, 128 },+ { 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 }+ },
+ { /* Coeff Band ( 4 )*/+ { 1, 132, 239, 251, 219, 209, 255, 165, 128, 128, 128 },+ { 94, 136, 225, 251, 218, 190, 255, 255, 128, 128, 128 },+ { 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 }+ },
+ { /* Coeff Band ( 5 )*/+ { 1, 182, 249, 255, 232, 235, 128, 128, 128, 128, 128 },+ { 124, 143, 241, 255, 227, 234, 128, 128, 128, 128, 128 },+ { 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 }+ },
+ { /* Coeff Band ( 6 )*/+ { 1, 157, 247, 255, 236, 231, 255, 255, 128, 128, 128 },+ { 121, 141, 235, 255, 225, 227, 255, 255, 128, 128, 128 },+ { 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 }+ },
+ { /* Coeff Band ( 7 )*/+ { 1, 1, 251, 255, 213, 255, 128, 128, 128, 128, 128 },+ { 203, 1, 248, 255, 255, 128, 128, 128, 128, 128, 128 },+ { 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 }+ }
+ },
+ { /* Block Type ( 2 ) */+ { /* Coeff Band ( 0 )*/+ { 253, 9, 248, 251, 207, 208, 255, 192, 128, 128, 128 },+ { 175, 13, 224, 243, 193, 185, 249, 198, 255, 255, 128 },+ { 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 }+ },
+ { /* Coeff Band ( 1 )*/+ { 1, 95, 247, 253, 212, 183, 255, 255, 128, 128, 128 },+ { 239, 90, 244, 250, 211, 209, 255, 255, 128, 128, 128 },+ { 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 }+ },
+ { /* Coeff Band ( 2 )*/+ { 1, 24, 239, 251, 218, 219, 255, 205, 128, 128, 128 },+ { 201, 51, 219, 255, 196, 186, 128, 128, 128, 128, 128 },+ { 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 }+ },
+ { /* Coeff Band ( 3 )*/+ { 1, 191, 251, 255, 255, 128, 128, 128, 128, 128, 128 },+ { 223, 165, 249, 255, 213, 255, 128, 128, 128, 128, 128 },+ { 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 4 )*/+ { 1, 16, 248, 255, 255, 128, 128, 128, 128, 128, 128 },+ { 190, 36, 230, 255, 236, 255, 128, 128, 128, 128, 128 },+ { 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 5 )*/+ { 1, 226, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 247, 192, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 6 )*/+ { 1, 134, 252, 255, 255, 128, 128, 128, 128, 128, 128 },+ { 213, 62, 250, 255, 255, 128, 128, 128, 128, 128, 128 },+ { 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 }+ },
+ { /* Coeff Band ( 7 )*/+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }+ }
+ },
+ { /* Block Type ( 3 ) */+ { /* Coeff Band ( 0 )*/+ { 202, 24, 213, 235, 186, 191, 220, 160, 240, 175, 255 },+ { 126, 38, 182, 232, 169, 184, 228, 174, 255, 187, 128 },+ { 61, 46, 138, 219, 151, 178, 240, 170, 255, 216, 128 }+ },
+ { /* Coeff Band ( 1 )*/+ { 1, 112, 230, 250, 199, 191, 247, 159, 255, 255, 128 },+ { 166, 109, 228, 252, 211, 215, 255, 174, 128, 128, 128 },+ { 39, 77, 162, 232, 172, 180, 245, 178, 255, 255, 128 }+ },
+ { /* Coeff Band ( 2 )*/+ { 1, 52, 220, 246, 198, 199, 249, 220, 255, 255, 128 },+ { 124, 74, 191, 243, 183, 193, 250, 221, 255, 255, 128 },+ { 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 }+ },
+ { /* Coeff Band ( 3 )*/+ { 1, 182, 225, 249, 219, 240, 255, 224, 128, 128, 128 },+ { 149, 150, 226, 252, 216, 205, 255, 171, 128, 128, 128 },+ { 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 }+ },
+ { /* Coeff Band ( 4 )*/+ { 1, 81, 230, 252, 204, 203, 255, 192, 128, 128, 128 },+ { 123, 102, 209, 247, 188, 196, 255, 233, 128, 128, 128 },+ { 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 }+ },
+ { /* Coeff Band ( 5 )*/+ { 1, 222, 248, 255, 216, 213, 128, 128, 128, 128, 128 },+ { 168, 175, 246, 252, 235, 205, 255, 255, 128, 128, 128 },+ { 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 }+ },
+ { /* Coeff Band ( 6 )*/+ { 1, 121, 236, 253, 212, 214, 255, 255, 128, 128, 128 },+ { 141, 84, 213, 252, 201, 202, 255, 219, 128, 128, 128 },+ { 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 }+ },
+ { /* Coeff Band ( 7 )*/+ { 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 244, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },+ { 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }+ }
+ }
+};
--- a/vp8/common/defaultcoefcounts.c
+++ /dev/null
@@ -1,225 +1,0 @@
-/*
- * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "defaultcoefcounts.h"
-
-/* Generated file, included by entropy.c */
-
-const unsigned int vp8_default_coef_counts[BLOCK_TYPES]
- [COEF_BANDS]
- [PREV_COEF_CONTEXTS]
- [MAX_ENTROPY_TOKENS] =
-{-
- {- /* Block Type ( 0 ) */
- {- /* Coeff Band ( 0 ) */
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- },
- {- /* Coeff Band ( 1 ) */
- {30190, 26544, 225, 24, 4, 0, 0, 0, 0, 0, 0, 4171593,},- {26846, 25157, 1241, 130, 26, 6, 1, 0, 0, 0, 0, 149987,},- {10484, 9538, 1006, 160, 36, 18, 0, 0, 0, 0, 0, 15104,},- },
- {- /* Coeff Band ( 2 ) */
- {25842, 40456, 1126, 83, 11, 2, 0, 0, 0, 0, 0, 0,},- {9338, 8010, 512, 73, 7, 3, 2, 0, 0, 0, 0, 43294,},- {1047, 751, 149, 31, 13, 6, 1, 0, 0, 0, 0, 879,},- },
- {- /* Coeff Band ( 3 ) */
- {26136, 9826, 252, 13, 0, 0, 0, 0, 0, 0, 0, 0,},- {8134, 5574, 191, 14, 2, 0, 0, 0, 0, 0, 0, 35302,},- { 605, 677, 116, 9, 1, 0, 0, 0, 0, 0, 0, 611,},- },
- {- /* Coeff Band ( 4 ) */
- {10263, 15463, 283, 17, 0, 0, 0, 0, 0, 0, 0, 0,},- {2773, 2191, 128, 9, 2, 2, 0, 0, 0, 0, 0, 10073,},- { 134, 125, 32, 4, 0, 2, 0, 0, 0, 0, 0, 50,},- },
- {- /* Coeff Band ( 5 ) */
- {10483, 2663, 23, 1, 0, 0, 0, 0, 0, 0, 0, 0,},- {2137, 1251, 27, 1, 1, 0, 0, 0, 0, 0, 0, 14362,},- { 116, 156, 14, 2, 1, 0, 0, 0, 0, 0, 0, 190,},- },
- {- /* Coeff Band ( 6 ) */
- {40977, 27614, 412, 28, 0, 0, 0, 0, 0, 0, 0, 0,},- {6113, 5213, 261, 22, 3, 0, 0, 0, 0, 0, 0, 26164,},- { 382, 312, 50, 14, 2, 0, 0, 0, 0, 0, 0, 345,},- },
- {- /* Coeff Band ( 7 ) */
- { 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 319,},- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,},- },
- },
- {- /* Block Type ( 1 ) */
- {- /* Coeff Band ( 0 ) */
- {3268, 19382, 1043, 250, 93, 82, 49, 26, 17, 8, 25, 82289,},- {8758, 32110, 5436, 1832, 827, 668, 420, 153, 24, 0, 3, 52914,},- {9337, 23725, 8487, 3954, 2107, 1836, 1069, 399, 59, 0, 0, 18620,},- },
- {- /* Coeff Band ( 1 ) */
- {12419, 8420, 452, 62, 9, 1, 0, 0, 0, 0, 0, 0,},- {11715, 8705, 693, 92, 15, 7, 2, 0, 0, 0, 0, 53988,},- {7603, 8585, 2306, 778, 270, 145, 39, 5, 0, 0, 0, 9136,},- },
- {- /* Coeff Band ( 2 ) */
- {15938, 14335, 1207, 184, 55, 13, 4, 1, 0, 0, 0, 0,},- {7415, 6829, 1138, 244, 71, 26, 7, 0, 0, 0, 0, 9980,},- {1580, 1824, 655, 241, 89, 46, 10, 2, 0, 0, 0, 429,},- },
- {- /* Coeff Band ( 3 ) */
- {19453, 5260, 201, 19, 0, 0, 0, 0, 0, 0, 0, 0,},- {9173, 3758, 213, 22, 1, 1, 0, 0, 0, 0, 0, 9820,},- {1689, 1277, 276, 51, 17, 4, 0, 0, 0, 0, 0, 679,},- },
- {- /* Coeff Band ( 4 ) */
- {12076, 10667, 620, 85, 19, 9, 5, 0, 0, 0, 0, 0,},- {4665, 3625, 423, 55, 19, 9, 0, 0, 0, 0, 0, 5127,},- { 415, 440, 143, 34, 20, 7, 2, 0, 0, 0, 0, 101,},- },
- {- /* Coeff Band ( 5 ) */
- {12183, 4846, 115, 11, 1, 0, 0, 0, 0, 0, 0, 0,},- {4226, 3149, 177, 21, 2, 0, 0, 0, 0, 0, 0, 7157,},- { 375, 621, 189, 51, 11, 4, 1, 0, 0, 0, 0, 198,},- },
- {- /* Coeff Band ( 6 ) */
- {61658, 37743, 1203, 94, 10, 3, 0, 0, 0, 0, 0, 0,},- {15514, 11563, 903, 111, 14, 5, 0, 0, 0, 0, 0, 25195,},- { 929, 1077, 291, 78, 14, 7, 1, 0, 0, 0, 0, 507,},- },
- {- /* Coeff Band ( 7 ) */
- { 0, 990, 15, 3, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 412, 13, 0, 0, 0, 0, 0, 0, 0, 0, 1641,},- { 0, 18, 7, 1, 0, 0, 0, 0, 0, 0, 0, 30,},- },
- },
- {- /* Block Type ( 2 ) */
- {- /* Coeff Band ( 0 ) */
- { 953, 24519, 628, 120, 28, 12, 4, 0, 0, 0, 0, 2248798,},- {1525, 25654, 2647, 617, 239, 143, 42, 5, 0, 0, 0, 66837,},- {1180, 11011, 3001, 1237, 532, 448, 239, 54, 5, 0, 0, 7122,},- },
- {- /* Coeff Band ( 1 ) */
- {1356, 2220, 67, 10, 4, 1, 0, 0, 0, 0, 0, 0,},- {1450, 2544, 102, 18, 4, 3, 0, 0, 0, 0, 0, 57063,},- {1182, 2110, 470, 130, 41, 21, 0, 0, 0, 0, 0, 6047,},- },
- {- /* Coeff Band ( 2 ) */
- { 370, 3378, 200, 30, 5, 4, 1, 0, 0, 0, 0, 0,},- { 293, 1006, 131, 29, 11, 0, 0, 0, 0, 0, 0, 5404,},- { 114, 387, 98, 23, 4, 8, 1, 0, 0, 0, 0, 236,},- },
- {- /* Coeff Band ( 3 ) */
- { 579, 194, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 395, 213, 5, 1, 0, 0, 0, 0, 0, 0, 0, 4157,},- { 119, 122, 4, 0, 0, 0, 0, 0, 0, 0, 0, 300,},- },
- {- /* Coeff Band ( 4 ) */
- { 38, 557, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 21, 114, 12, 1, 0, 0, 0, 0, 0, 0, 0, 427,},- { 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,},- },
- {- /* Coeff Band ( 5 ) */
- { 52, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 18, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 652,},- { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,},- },
- {- /* Coeff Band ( 6 ) */
- { 640, 569, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 25, 77, 2, 0, 0, 0, 0, 0, 0, 0, 0, 517,},- { 4, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,},- },
- {- /* Coeff Band ( 7 ) */
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- },
- },
- {- /* Block Type ( 3 ) */
- {- /* Coeff Band ( 0 ) */
- {2506, 20161, 2707, 767, 261, 178, 107, 30, 14, 3, 0, 100694,},- {8806, 36478, 8817, 3268, 1280, 850, 401, 114, 42, 0, 0, 58572,},- {11003, 27214, 11798, 5716, 2482, 2072, 1048, 175, 32, 0, 0, 19284,},- },
- {- /* Coeff Band ( 1 ) */
- {9738, 11313, 959, 205, 70, 18, 11, 1, 0, 0, 0, 0,},- {12628, 15085, 1507, 273, 52, 19, 9, 0, 0, 0, 0, 54280,},- {10701, 15846, 5561, 1926, 813, 570, 249, 36, 0, 0, 0, 6460,},- },
- {- /* Coeff Band ( 2 ) */
- {6781, 22539, 2784, 634, 182, 123, 20, 4, 0, 0, 0, 0,},- {6263, 11544, 2649, 790, 259, 168, 27, 5, 0, 0, 0, 20539,},- {3109, 4075, 2031, 896, 457, 386, 158, 29, 0, 0, 0, 1138,},- },
- {- /* Coeff Band ( 3 ) */
- {11515, 4079, 465, 73, 5, 14, 2, 0, 0, 0, 0, 0,},- {9361, 5834, 650, 96, 24, 8, 4, 0, 0, 0, 0, 22181,},- {4343, 3974, 1360, 415, 132, 96, 14, 1, 0, 0, 0, 1267,},- },
- {- /* Coeff Band ( 4 ) */
- {4787, 9297, 823, 168, 44, 12, 4, 0, 0, 0, 0, 0,},- {3619, 4472, 719, 198, 60, 31, 3, 0, 0, 0, 0, 8401,},- {1157, 1175, 483, 182, 88, 31, 8, 0, 0, 0, 0, 268,},- },
- {- /* Coeff Band ( 5 ) */
- {8299, 1226, 32, 5, 1, 0, 0, 0, 0, 0, 0, 0,},- {3502, 1568, 57, 4, 1, 1, 0, 0, 0, 0, 0, 9811,},- {1055, 1070, 166, 29, 6, 1, 0, 0, 0, 0, 0, 527,},- },
- {- /* Coeff Band ( 6 ) */
- {27414, 27927, 1989, 347, 69, 26, 0, 0, 0, 0, 0, 0,},- {5876, 10074, 1574, 341, 91, 24, 4, 0, 0, 0, 0, 21954,},- {1571, 2171, 778, 324, 124, 65, 16, 0, 0, 0, 0, 979,},- },
- {- /* Coeff Band ( 7 ) */
- { 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},- { 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 459,},- { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13,},- },
- },
-};
--- a/vp8/common/defaultcoefcounts.h
+++ /dev/null
@@ -1,21 +1,0 @@
-/*
- * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef __DEFAULTCOEFCOUNTS_H
-#define __DEFAULTCOEFCOUNTS_H
-
-#include "entropy.h"
-
-extern const unsigned int vp8_default_coef_counts[BLOCK_TYPES]
- [COEF_BANDS]
- [PREV_COEF_CONTEXTS]
- [MAX_ENTROPY_TOKENS];
-
-#endif //__DEFAULTCOEFCOUNTS_H
--- 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,38 +154,14 @@
{ 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()
{--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -22,8 +22,9 @@
#include "vpx/vpx_encoder.h"
#include "vpx_mem/vpx_mem.h"
#include "bitstream.h"
-#include "vp8/common/defaultcoefcounts.h"
+#include "defaultcoefcounts.h"
+
const int vp8cx_base_skip_false_prob[128] =
{255, 255, 255, 255, 255, 255, 255, 255,
@@ -1199,7 +1200,7 @@
if (cpi->common.frame_type == KEY_FRAME)
{/* Reset to default probabilities at key frames */
- sum_probs_over_prev_coef_context(vp8_default_coef_counts[i][j],
+ sum_probs_over_prev_coef_context(default_coef_counts[i][j],
prev_coef_count_sum);
}
else
--- /dev/null
+++ b/vp8/encoder/defaultcoefcounts.h
@@ -1,0 +1,223 @@
+/*
+ * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+/* Generated file, included by entropy.c */
+
+static const unsigned int default_coef_counts[BLOCK_TYPES]
+ [COEF_BANDS]
+ [PREV_COEF_CONTEXTS]
+ [MAX_ENTROPY_TOKENS] =
+{+
+ {+ /* Block Type ( 0 ) */
+ {+ /* Coeff Band ( 0 ) */
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ },
+ {+ /* Coeff Band ( 1 ) */
+ {30190, 26544, 225, 24, 4, 0, 0, 0, 0, 0, 0, 4171593,},+ {26846, 25157, 1241, 130, 26, 6, 1, 0, 0, 0, 0, 149987,},+ {10484, 9538, 1006, 160, 36, 18, 0, 0, 0, 0, 0, 15104,},+ },
+ {+ /* Coeff Band ( 2 ) */
+ {25842, 40456, 1126, 83, 11, 2, 0, 0, 0, 0, 0, 0,},+ {9338, 8010, 512, 73, 7, 3, 2, 0, 0, 0, 0, 43294,},+ {1047, 751, 149, 31, 13, 6, 1, 0, 0, 0, 0, 879,},+ },
+ {+ /* Coeff Band ( 3 ) */
+ {26136, 9826, 252, 13, 0, 0, 0, 0, 0, 0, 0, 0,},+ {8134, 5574, 191, 14, 2, 0, 0, 0, 0, 0, 0, 35302,},+ { 605, 677, 116, 9, 1, 0, 0, 0, 0, 0, 0, 611,},+ },
+ {+ /* Coeff Band ( 4 ) */
+ {10263, 15463, 283, 17, 0, 0, 0, 0, 0, 0, 0, 0,},+ {2773, 2191, 128, 9, 2, 2, 0, 0, 0, 0, 0, 10073,},+ { 134, 125, 32, 4, 0, 2, 0, 0, 0, 0, 0, 50,},+ },
+ {+ /* Coeff Band ( 5 ) */
+ {10483, 2663, 23, 1, 0, 0, 0, 0, 0, 0, 0, 0,},+ {2137, 1251, 27, 1, 1, 0, 0, 0, 0, 0, 0, 14362,},+ { 116, 156, 14, 2, 1, 0, 0, 0, 0, 0, 0, 190,},+ },
+ {+ /* Coeff Band ( 6 ) */
+ {40977, 27614, 412, 28, 0, 0, 0, 0, 0, 0, 0, 0,},+ {6113, 5213, 261, 22, 3, 0, 0, 0, 0, 0, 0, 26164,},+ { 382, 312, 50, 14, 2, 0, 0, 0, 0, 0, 0, 345,},+ },
+ {+ /* Coeff Band ( 7 ) */
+ { 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 319,},+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8,},+ },
+ },
+ {+ /* Block Type ( 1 ) */
+ {+ /* Coeff Band ( 0 ) */
+ {3268, 19382, 1043, 250, 93, 82, 49, 26, 17, 8, 25, 82289,},+ {8758, 32110, 5436, 1832, 827, 668, 420, 153, 24, 0, 3, 52914,},+ {9337, 23725, 8487, 3954, 2107, 1836, 1069, 399, 59, 0, 0, 18620,},+ },
+ {+ /* Coeff Band ( 1 ) */
+ {12419, 8420, 452, 62, 9, 1, 0, 0, 0, 0, 0, 0,},+ {11715, 8705, 693, 92, 15, 7, 2, 0, 0, 0, 0, 53988,},+ {7603, 8585, 2306, 778, 270, 145, 39, 5, 0, 0, 0, 9136,},+ },
+ {+ /* Coeff Band ( 2 ) */
+ {15938, 14335, 1207, 184, 55, 13, 4, 1, 0, 0, 0, 0,},+ {7415, 6829, 1138, 244, 71, 26, 7, 0, 0, 0, 0, 9980,},+ {1580, 1824, 655, 241, 89, 46, 10, 2, 0, 0, 0, 429,},+ },
+ {+ /* Coeff Band ( 3 ) */
+ {19453, 5260, 201, 19, 0, 0, 0, 0, 0, 0, 0, 0,},+ {9173, 3758, 213, 22, 1, 1, 0, 0, 0, 0, 0, 9820,},+ {1689, 1277, 276, 51, 17, 4, 0, 0, 0, 0, 0, 679,},+ },
+ {+ /* Coeff Band ( 4 ) */
+ {12076, 10667, 620, 85, 19, 9, 5, 0, 0, 0, 0, 0,},+ {4665, 3625, 423, 55, 19, 9, 0, 0, 0, 0, 0, 5127,},+ { 415, 440, 143, 34, 20, 7, 2, 0, 0, 0, 0, 101,},+ },
+ {+ /* Coeff Band ( 5 ) */
+ {12183, 4846, 115, 11, 1, 0, 0, 0, 0, 0, 0, 0,},+ {4226, 3149, 177, 21, 2, 0, 0, 0, 0, 0, 0, 7157,},+ { 375, 621, 189, 51, 11, 4, 1, 0, 0, 0, 0, 198,},+ },
+ {+ /* Coeff Band ( 6 ) */
+ {61658, 37743, 1203, 94, 10, 3, 0, 0, 0, 0, 0, 0,},+ {15514, 11563, 903, 111, 14, 5, 0, 0, 0, 0, 0, 25195,},+ { 929, 1077, 291, 78, 14, 7, 1, 0, 0, 0, 0, 507,},+ },
+ {+ /* Coeff Band ( 7 ) */
+ { 0, 990, 15, 3, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 412, 13, 0, 0, 0, 0, 0, 0, 0, 0, 1641,},+ { 0, 18, 7, 1, 0, 0, 0, 0, 0, 0, 0, 30,},+ },
+ },
+ {+ /* Block Type ( 2 ) */
+ {+ /* Coeff Band ( 0 ) */
+ { 953, 24519, 628, 120, 28, 12, 4, 0, 0, 0, 0, 2248798,},+ {1525, 25654, 2647, 617, 239, 143, 42, 5, 0, 0, 0, 66837,},+ {1180, 11011, 3001, 1237, 532, 448, 239, 54, 5, 0, 0, 7122,},+ },
+ {+ /* Coeff Band ( 1 ) */
+ {1356, 2220, 67, 10, 4, 1, 0, 0, 0, 0, 0, 0,},+ {1450, 2544, 102, 18, 4, 3, 0, 0, 0, 0, 0, 57063,},+ {1182, 2110, 470, 130, 41, 21, 0, 0, 0, 0, 0, 6047,},+ },
+ {+ /* Coeff Band ( 2 ) */
+ { 370, 3378, 200, 30, 5, 4, 1, 0, 0, 0, 0, 0,},+ { 293, 1006, 131, 29, 11, 0, 0, 0, 0, 0, 0, 5404,},+ { 114, 387, 98, 23, 4, 8, 1, 0, 0, 0, 0, 236,},+ },
+ {+ /* Coeff Band ( 3 ) */
+ { 579, 194, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 395, 213, 5, 1, 0, 0, 0, 0, 0, 0, 0, 4157,},+ { 119, 122, 4, 0, 0, 0, 0, 0, 0, 0, 0, 300,},+ },
+ {+ /* Coeff Band ( 4 ) */
+ { 38, 557, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 21, 114, 12, 1, 0, 0, 0, 0, 0, 0, 0, 427,},+ { 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7,},+ },
+ {+ /* Coeff Band ( 5 ) */
+ { 52, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 18, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 652,},+ { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30,},+ },
+ {+ /* Coeff Band ( 6 ) */
+ { 640, 569, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 25, 77, 2, 0, 0, 0, 0, 0, 0, 0, 0, 517,},+ { 4, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3,},+ },
+ {+ /* Coeff Band ( 7 ) */
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ },
+ },
+ {+ /* Block Type ( 3 ) */
+ {+ /* Coeff Band ( 0 ) */
+ {2506, 20161, 2707, 767, 261, 178, 107, 30, 14, 3, 0, 100694,},+ {8806, 36478, 8817, 3268, 1280, 850, 401, 114, 42, 0, 0, 58572,},+ {11003, 27214, 11798, 5716, 2482, 2072, 1048, 175, 32, 0, 0, 19284,},+ },
+ {+ /* Coeff Band ( 1 ) */
+ {9738, 11313, 959, 205, 70, 18, 11, 1, 0, 0, 0, 0,},+ {12628, 15085, 1507, 273, 52, 19, 9, 0, 0, 0, 0, 54280,},+ {10701, 15846, 5561, 1926, 813, 570, 249, 36, 0, 0, 0, 6460,},+ },
+ {+ /* Coeff Band ( 2 ) */
+ {6781, 22539, 2784, 634, 182, 123, 20, 4, 0, 0, 0, 0,},+ {6263, 11544, 2649, 790, 259, 168, 27, 5, 0, 0, 0, 20539,},+ {3109, 4075, 2031, 896, 457, 386, 158, 29, 0, 0, 0, 1138,},+ },
+ {+ /* Coeff Band ( 3 ) */
+ {11515, 4079, 465, 73, 5, 14, 2, 0, 0, 0, 0, 0,},+ {9361, 5834, 650, 96, 24, 8, 4, 0, 0, 0, 0, 22181,},+ {4343, 3974, 1360, 415, 132, 96, 14, 1, 0, 0, 0, 1267,},+ },
+ {+ /* Coeff Band ( 4 ) */
+ {4787, 9297, 823, 168, 44, 12, 4, 0, 0, 0, 0, 0,},+ {3619, 4472, 719, 198, 60, 31, 3, 0, 0, 0, 0, 8401,},+ {1157, 1175, 483, 182, 88, 31, 8, 0, 0, 0, 0, 268,},+ },
+ {+ /* Coeff Band ( 5 ) */
+ {8299, 1226, 32, 5, 1, 0, 0, 0, 0, 0, 0, 0,},+ {3502, 1568, 57, 4, 1, 1, 0, 0, 0, 0, 0, 9811,},+ {1055, 1070, 166, 29, 6, 1, 0, 0, 0, 0, 0, 527,},+ },
+ {+ /* Coeff Band ( 6 ) */
+ {27414, 27927, 1989, 347, 69, 26, 0, 0, 0, 0, 0, 0,},+ {5876, 10074, 1574, 341, 91, 24, 4, 0, 0, 0, 0, 21954,},+ {1571, 2171, 778, 324, 124, 65, 16, 0, 0, 0, 0, 979,},+ },
+ {+ /* Coeff Band ( 7 ) */
+ { 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,},+ { 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 459,},+ { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13,},+ },
+ },
+};
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -19,8 +19,6 @@
VP8_COMMON_SRCS-yes += common/blockd.c
VP8_COMMON_SRCS-yes += common/coefupdateprobs.h
VP8_COMMON_SRCS-yes += common/debugmodes.c
-VP8_COMMON_SRCS-yes += common/defaultcoefcounts.h
-VP8_COMMON_SRCS-yes += common/defaultcoefcounts.c
VP8_COMMON_SRCS-yes += common/entropy.c
VP8_COMMON_SRCS-yes += common/entropymode.c
VP8_COMMON_SRCS-yes += common/entropymv.c
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -34,6 +34,7 @@
#INCLUDES += encoder
VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c
+VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h
VP8_CX_SRCS-yes += encoder/bitstream.c
VP8_CX_SRCS-yes += encoder/boolhuff.c
VP8_CX_SRCS-yes += encoder/dct.c
--
⑨