summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/coefupdateprobs.h68
-rw-r--r--vp8/common/defaultcoefcounts.h68
-rw-r--r--vp8/common/entropy.c2
-rw-r--r--vp8/common/entropy.h4
-rw-r--r--vp8/common/onyxc_int.h2
5 files changed, 7 insertions, 137 deletions
diff --git a/vp8/common/coefupdateprobs.h b/vp8/common/coefupdateprobs.h
index 714dd464a..ec6354616 100644
--- a/vp8/common/coefupdateprobs.h
+++ b/vp8/common/coefupdateprobs.h
@@ -279,7 +279,7 @@ const vp8_prob vp8_coef_update_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTE
},
},
};
-const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES]
+const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES_8X8]
[COEF_BANDS]
[PREV_COEF_CONTEXTS]
[ENTROPY_NODES] =
@@ -482,71 +482,5 @@ const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES]
{249, 244, 249, 255, 255, 255, 255, 255, 255, 255, 255, },
},
},
- {
- {
- {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, },
- {249, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 239, 234, 244, 239, 244, 249, 255, 255, 255, 255, },
-#endif
- {255, 239, 234, 244, 239, 244, 249, 255, 255, 255, 255, },
- },
- {
- {255, 249, 239, 239, 244, 255, 255, 255, 255, 255, 255, },
- {255, 249, 244, 255, 249, 255, 255, 255, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 255, 239, 255, 255, 249, 255, 255, 255, 255, 255, },
-#endif
- {255, 255, 239, 255, 255, 249, 255, 255, 255, 255, 255, },
- },
- {
- {255, 244, 239, 239, 244, 255, 255, 255, 255, 255, 255, },
- {255, 234, 239, 234, 249, 255, 255, 255, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 255, 229, 239, 234, 249, 244, 255, 255, 255, 255, },
-#endif
- {255, 255, 229, 239, 234, 249, 244, 255, 255, 255, 255, },
- },
- {
- {255, 239, 229, 239, 234, 234, 255, 255, 255, 255, 255, },
- {255, 239, 234, 229, 244, 239, 255, 234, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 229, 209, 229, 239, 234, 244, 229, 255, 249, 255, },
-#endif
- {255, 229, 209, 229, 239, 234, 244, 229, 255, 249, 255, },
- },
- {
- {255, 239, 234, 229, 244, 249, 255, 249, 255, 255, 255, },
- {255, 234, 229, 244, 234, 249, 255, 249, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 229, 239, 229, 249, 255, 255, 244, 255, 255, 255, },
-#endif
- {255, 229, 239, 229, 249, 255, 255, 244, 255, 255, 255, },
- },
- {
- {255, 239, 234, 239, 234, 239, 255, 249, 255, 255, 255, },
- {255, 229, 234, 239, 239, 239, 255, 244, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 229, 234, 239, 239, 244, 255, 255, 255, 255, 255, },
-#endif
- {255, 229, 234, 239, 239, 244, 255, 255, 255, 255, 255, },
- },
- {
- {255, 219, 224, 229, 229, 234, 239, 224, 255, 255, 255, },
- {255, 229, 229, 224, 234, 229, 239, 239, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {255, 229, 224, 239, 234, 239, 224, 224, 255, 249, 255, },
-#endif
- {255, 229, 224, 239, 234, 239, 224, 224, 255, 249, 255, },
- },
- {
- {255, 234, 229, 244, 229, 229, 255, 214, 255, 255, 255, },
- {255, 239, 234, 239, 214, 239, 255, 209, 255, 255, 255, },
-#if CONFIG_EXPANDED_COEF_CONTEXT
- {249, 239, 219, 209, 219, 224, 239, 204, 255, 255, 255, },
-#endif
- {249, 239, 219, 209, 219, 224, 239, 204, 255, 255, 255, },
- },
- },
};
diff --git a/vp8/common/defaultcoefcounts.h b/vp8/common/defaultcoefcounts.h
index da41e40e0..c13855d28 100644
--- a/vp8/common/defaultcoefcounts.h
+++ b/vp8/common/defaultcoefcounts.h
@@ -10,7 +10,7 @@
/* Generated file, included by entropy.c */
-static const unsigned int vp8_default_coef_counts_8x8[BLOCK_TYPES]
+static const unsigned int vp8_default_coef_counts_8x8[BLOCK_TYPES_8X8]
[COEF_BANDS]
[PREV_COEF_CONTEXTS]
[MAX_ENTROPY_TOKENS] =
@@ -214,70 +214,4 @@ static const unsigned int vp8_default_coef_counts_8x8[BLOCK_TYPES]
{ 3882867, 3224489, 1052289, 252890, 46967, 8548, 154, 0, 0, 0, 0, 194354},
}
},
- { /* block Type 3 */
- { /* Coeff Band 0 */
- { 10583, 12059, 3155, 1041, 248, 175, 24, 2, 0, 0, 0, 5717},
- { 42461, 41782, 13553, 4966, 1352, 855, 89, 0, 0, 0, 0, 15000},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 4691125, 5045589, 2673566, 1089317, 378161, 160268, 18252, 813, 69, 13, 0, 49},
-#endif
- { 4691125, 5045589, 2673566, 1089317, 378161, 160268, 18252, 813, 69, 13, 0, 49},
- },
- { /* Coeff Band 1 */
- { 1535203, 1685686, 924565, 390329, 141709, 60523, 5983, 171, 0, 0, 0, 0},
- { 1594021, 1793276, 1016078, 441332, 164159, 70843, 8098, 311, 0, 0, 0, 11312},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 1225223, 1430184, 888492, 460713, 203286, 115149, 22061, 804, 7, 0, 0, 0},
-#endif
- { 1225223, 1430184, 888492, 460713, 203286, 115149, 22061, 804, 7, 0, 0, 0},
- },
- { /* Coeff Band 2 */
- { 1522386, 1590366, 799910, 303691, 96625, 37608, 3637, 180, 33, 11, 0, 0},
- { 1682184, 1793869, 913649, 353520, 113674, 46309, 4736, 221, 18, 3, 0, 963},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 1574580, 1740474, 954392, 417994, 151400, 67091, 8000, 536, 73, 10, 0, 63},
-#endif
- { 1574580, 1740474, 954392, 417994, 151400, 67091, 8000, 536, 73, 10, 0, 63},
- },
- { /* Coeff Band 3 */
- { 4963672, 5197790, 2585383, 982161, 313333, 118498, 16014, 536, 62, 0, 0, 0},
- { 5223913, 5569803, 2845858, 1107384, 364949, 147841, 18296, 658, 11, 11, 0, 1866},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 4042207, 4548894, 2608767, 1154993, 446290, 221295, 41054, 2438, 124, 20, 0, 0},
-#endif
- { 4042207, 4548894, 2608767, 1154993, 446290, 221295, 41054, 2438, 124, 20, 0, 0},
- },
- { /* Coeff Band 4 */
- { 3857216, 4431325, 2670447, 1330169, 553301, 286825, 46763, 1917, 0, 0, 0, 0},
- { 4226215, 4963701, 3046198, 1523923, 644670, 355519, 58792, 2525, 0, 0, 0, 1298},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 3831873, 4580350, 3018580, 1660048, 797298, 502983, 123906, 7172, 16, 0, 0, 0},
-#endif
- { 3831873, 4580350, 3018580, 1660048, 797298, 502983, 123906, 7172, 16, 0, 0, 0},
- },
- { /* Coeff Band 5 */
- { 8524543, 9285149, 4979435, 2039330, 683458, 266032, 22628, 270, 0, 0, 0, 0},
- { 9432163, 10428088, 5715661, 2385738, 838389, 326264, 29981, 361, 0, 0, 0, 884},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 9039066, 10368964, 6136765, 2862030, 1098269, 511668, 63105, 945, 14, 0, 0, 0},
-#endif
- { 9039066, 10368964, 6136765, 2862030, 1098269, 511668, 63105, 945, 14, 0, 0, 0},
- },
- { /* Coeff Band 6 */
- { 33222872, 34748297, 17701695, 7214933, 2602336, 1191859, 187873, 12667, 390, 3, 0, 0},
- { 34765051, 37140719, 19525578, 8268934, 3085012, 1473864, 246743, 15258, 736, 3, 0, 8403},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 28591289, 32252393, 19037068, 9213729, 4020653, 2372354, 586420, 67428, 3920, 92, 7, 3},
-#endif
- { 28591289, 32252393, 19037068, 9213729, 4020653, 2372354, 586420, 67428, 3920, 92, 7, 3},
- },
- { /* Coeff Band 7 */
- { 68604786, 60777665, 19712887, 5656955, 1520443, 507166, 51829, 2466, 10, 0, 0, 0},
- { 55447403, 51682540, 19008774, 5928582, 1706884, 595531, 65998, 3661, 101, 0, 0, 8468343},
-#if CONFIG_EXPANDED_COEF_CONTEXT
- { 28321970, 29149398, 13565882, 5258675, 1868588, 898041, 192023, 21497, 672, 17, 0, 1884921},
-#endif
- { 28321970, 29149398, 13565882, 5258675, 1868588, 898041, 192023, 21497, 672, 17, 0, 1884921},
- }
- }
};
diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c
index 8c0ebf19b..170d17640 100644
--- a/vp8/common/entropy.c
+++ b/vp8/common/entropy.c
@@ -204,7 +204,7 @@ void vp8_default_coef_probs(VP8_COMMON *pc)
}
while (++i < COEF_BANDS);
}
- while (++h < BLOCK_TYPES);
+ while (++h < BLOCK_TYPES_8X8);
}
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h
index 113332fed..42de3ea52 100644
--- a/vp8/common/entropy.h
+++ b/vp8/common/entropy.h
@@ -58,6 +58,8 @@ extern vp8_extra_bit_struct vp8_extra_bits[12]; /* indexed by token value */
#define BLOCK_TYPES 4
+#define BLOCK_TYPES_8X8 3
+
/* Middle dimension is a coarsening of the coefficient's
position within the 4x4 DCT. */
@@ -97,7 +99,7 @@ extern DECLARE_ALIGNED(64, const unsigned char, vp8_coef_bands_8x8[64]);
extern DECLARE_ALIGNED(16, const unsigned char, vp8_prev_token_class[MAX_ENTROPY_TOKENS]);
extern const vp8_prob vp8_coef_update_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
-extern const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
+extern const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
struct VP8Common;
void vp8_default_coef_probs(struct VP8Common *);
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 1f4652148..f36915c51 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -49,7 +49,7 @@ typedef struct frame_contexts
vp8_prob uv_mode_prob [VP8_YMODES][VP8_UV_MODES-1];
vp8_prob sub_mv_ref_prob [VP8_SUBMVREFS-1];
vp8_prob coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
- vp8_prob coef_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
+ vp8_prob coef_probs_8x8 [BLOCK_TYPES_8X8] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES];
MV_CONTEXT mvc[2];
#if CONFIG_HIGH_PRECISION_MV
MV_CONTEXT_HP mvc_hp[2];
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 05:20:16 +0000