diff options
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/blockd.h | 22 | ||||
| -rw-r--r-- | vp8/common/defaultcoefcounts.h | 189 | ||||
| -rw-r--r-- | vp8/common/entropy.c | 4 | ||||
| -rw-r--r-- | vp8/common/entropymode.c | 45 | ||||
| -rw-r--r-- | vp8/common/entropymode.h | 7 | ||||
| -rw-r--r-- | vp8/common/findnearmv.c | 12 | ||||
| -rw-r--r-- | vp8/common/findnearmv.h | 17 | ||||
| -rw-r--r-- | vp8/common/generic/systemdependent.c | 11 | ||||
| -rw-r--r-- | vp8/common/onyxc_int.h | 3 | ||||
| -rw-r--r-- | vp8/common/recon.c | 32 | ||||
| -rw-r--r-- | vp8/common/recon.h | 45 | ||||
| -rw-r--r-- | vp8/common/reconintra.c | 190 |
12 files changed, 557 insertions, 20 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index d9558875a..21856f130 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -83,6 +83,9 @@ typedef enum V_PRED, /* vertical prediction */ H_PRED, /* horizontal prediction */ TM_PRED, /* Truemotion prediction */ +#if CONFIG_I8X8 + I8X8_PRED, /* 8x8 based prediction, each 8x8 has its own prediction mode */ +#endif B_PRED, /* block based prediction, each block has its own prediction mode */ NEARESTMV, @@ -114,6 +117,7 @@ typedef enum #define VP8_YMODES (B_PRED + 1) #define VP8_UV_MODES (TM_PRED + 1) +#define VP8_I8X8_MODES (TM_PRED + 1) #define VP8_MVREFS (1 + SPLITMV - NEARESTMV) @@ -306,4 +310,22 @@ typedef struct MacroBlockD extern void vp8_build_block_doffsets(MACROBLOCKD *x); extern void vp8_setup_block_dptrs(MACROBLOCKD *x); +static void update_blockd_bmi(MACROBLOCKD *xd) +{ + int i; + int is_4x4; + is_4x4 = (xd->mode_info_context->mbmi.mode == SPLITMV) || +#if CONFIG_I8X8 + (xd->mode_info_context->mbmi.mode==I8X8_PRED)|| +#endif + (xd->mode_info_context->mbmi.mode == B_PRED); + + if (is_4x4) + { + for (i = 0; i < 16; i++) + { + xd->block[i].bmi = xd->mode_info_context->bmi[i]; + } + } +} #endif /* __INC_BLOCKD_H */ diff --git a/vp8/common/defaultcoefcounts.h b/vp8/common/defaultcoefcounts.h new file mode 100644 index 000000000..d758e4038 --- /dev/null +++ b/vp8/common/defaultcoefcounts.h @@ -0,0 +1,189 @@ +/* + * 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 */ + +#if CONFIG_T8X8 +static const unsigned int vp8_default_coef_counts_8x8[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 */ + { 21041, 13314, 3420, 592, 117, 0, 0, 0, 0, 0, 0, 11783}, + { 48236, 6918, 586, 153, 0, 0, 0, 0, 0, 0, 0, 23137}, + { 676112, 106685, 24701, 6003, 1426, 429, 165, 0, 0, 0, 0, 28910} + }, + { /* Coeff Band 2 */ + { 660107, 75227, 8451, 1345, 259, 0, 0, 0, 0, 0, 0, 0}, + { 79164, 36835, 6865, 1185, 246, 47, 0, 0, 0, 0, 0, 2575}, + { 19469, 14330, 3070, 579, 94, 6, 0, 0, 0, 0, 0, 44} + }, + { /* Coeff Band 3 */ + { 1978004, 235343, 28485, 3242, 271, 0, 0, 0, 0, 0, 0, 0}, + { 228684, 106736, 21431, 2842, 272, 46, 0, 0, 0, 0, 0, 9266}, + { 32470, 27496, 6852, 1386, 45, 93, 0, 0, 0, 0, 0, 0} + }, + { /* Coeff Band 4 */ + { 1911212, 224613, 49653, 13748, 2541, 568, 48, 0, 0, 0, 0, 0}, + { 196670, 103472, 44473, 11490, 2432, 977, 72, 0, 0, 0, 0, 9447}, + { 37876, 40417, 19142, 6069, 1799, 727, 51, 0, 0, 0, 0, 0} + }, + { /* Coeff Band 5 */ + { 3813399, 437714, 64387, 11312, 695, 219, 0, 0, 0, 0, 0, 0}, + { 438288, 215917, 61905, 10194, 674, 107, 0, 0, 0, 0, 0, 17808}, + { 99139, 93643, 30054, 5758, 802, 171, 0, 0, 0, 0, 0, 0} + }, + { /* Coeff Band 6 */ + { 12259383, 1625505, 234927, 46306, 8417, 1456, 151, 0, 0, 0, 0, 0}, + { 1518161, 734287, 204240, 44228, 9462, 2240, 65, 0, 0, 0, 0, 107630}, + { 292470, 258894, 94925, 25864, 6662, 2055, 170, 0, 0, 0, 0, 0} + }, + { /* Coeff Band 7 */ + { 9791308, 2118949, 169439, 16735, 1122, 0, 0, 0, 0, 0, 0, 0}, + { 1500281, 752410, 123259, 13065, 1168, 47, 0, 0, 0, 0, 0, 707182}, + { 193067, 142638, 31018, 4719, 516, 138, 0, 0, 0, 0, 0, 12439} + } + }, + { /* block Type 1 */ + { /* Coeff Band 0 */ + { 16925, 10553, 852, 16, 63, 87, 47, 0, 0, 0, 0, 31232}, + { 39777, 26839, 6822, 1908, 678, 456, 227, 168, 35, 0, 0, 46825}, + { 17300, 16666, 4168, 1209, 492, 154, 118, 207, 0, 0, 0, 19608} + }, + { /* Coeff Band 1 */ + { 35882, 31722, 4625, 1270, 266, 237, 0, 0, 0, 0, 0, 0}, + { 15426, 13894, 4482, 1305, 281, 43, 0, 0, 0, 0, 0, 18627}, + { 3900, 6552, 3472, 1723, 746, 366, 115, 35, 0, 0, 0, 798} + }, + { /* Coeff Band 2 */ + { 21998, 29132, 3353, 679, 46, 0, 0, 0, 0, 0, 0, 0}, + { 9098, 15767, 3794, 792, 268, 47, 0, 0, 0, 0, 0, 22402}, + { 4007, 8472, 2844, 687, 217, 0, 0, 0, 0, 0, 0, 2739} + }, + { /* Coeff Band 3 */ + { 0, 31414, 2911, 682, 96, 0, 0, 0, 0, 0, 0, 0}, + { 0, 16515, 4425, 938, 124, 0, 0, 0, 0, 0, 0, 31369}, + { 0, 4833, 2787, 1213, 150, 0, 0, 0, 0, 0, 0, 3744} + }, + { /* Coeff Band 4 */ + { 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 5 */ + { 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 6 */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52762}, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13326} + }, + { /* 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 2 */ + { /* Coeff Band 0 */ + { 4444, 1614, 120, 48, 0, 48, 0, 0, 0, 0, 0, 278}, + { 192436, 103730, 24494, 9845, 4122, 1193, 102, 0, 0, 0, 0, 2577}, + { 3473446, 2308716, 815510, 370374, 167797, 92152, 12073, 86, 0, 0, 0, 6801} + }, + { /* Coeff Band 1 */ + { 2150616, 1136388, 250011, 86888, 31434, 13746, 1243, 0, 0, 0, 0, 0}, + { 1179945, 799802, 266012, 106787, 40809, 16486, 1546, 0, 0, 0, 0, 2673}, + { 465128, 504130, 286989, 146259, 62380, 30192, 2866, 20, 0, 0, 0, 0} + }, + { /* Coeff Band 2 */ + { 2157762, 1177519, 282665, 108499, 43389, 23224, 2597, 34, 0, 0, 0, 0}, + { 1135685, 813705, 278079, 123255, 53935, 29492, 3152, 39, 0, 0, 0, 2978}, + { 391894, 428037, 264216, 144306, 69326, 40281, 5541, 29, 0, 0, 0, 38} + }, + { /* Coeff Band 3 */ + { 6669109, 3468471, 782161, 288484, 115500, 51083, 4943, 41, 0, 0, 0, 0}, + { 3454493, 2361636, 809524, 337663, 141343, 65036, 6361, 0, 0, 0, 0, 8730}, + { 1231825, 1359522, 824686, 420784, 185517, 98731, 10973, 72, 0, 0, 0, 20} + }, + { /* Coeff Band 4 */ + { 7606203, 3452846, 659856, 191703, 49335, 14336, 450, 0, 0, 0, 0, 0}, + { 3806506, 2379332, 691697, 224938, 61966, 18324, 766, 0, 0, 0, 0, 8193}, + { 1270110, 1283728, 628775, 243378, 72617, 24897, 1087, 0, 0, 0, 0, 0} + }, + { /* Coeff Band 5 */ + { 15314169, 7436809, 1579928, 515790, 167453, 58305, 3502, 19, 0, 0, 0, 0}, + { 7021286, 4667922, 1545706, 574463, 191793, 68748, 4048, 1, 0, 0, 0, 17222}, + { 2011989, 2145878, 1185336, 534879, 195719, 79103, 5343, 4, 0, 0, 0, 37} + }, + { /* Coeff Band 6 */ + { 63458382, 25384462, 4208045, 1091050, 299011, 95242, 5238, 33, 0, 0, 0, 0}, + { 25638401, 14694085, 3945978, 1195420, 344813, 117355, 6703, 0, 0, 0, 0, 216811}, + { 5988177, 5824044, 2754413, 1077350, 370739, 139710, 9693, 38, 0, 0, 0, 1835} + }, + { /* Coeff Band 7 */ + { 74998348, 29342158, 2955001, 452912, 69631, 9516, 37, 0, 0, 0, 0, 0}, + { 24762356, 13281085, 2409883, 436787, 68948, 10658, 36, 0, 0, 0, 0, 6614989}, + { 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}, + { 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}, + { 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}, + { 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}, + { 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}, + { 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}, + { 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}, + { 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}, + { 28321970, 29149398, 13565882, 5258675, 1868588, 898041, 192023, 21497, 672, 17, 0, 1884921} + } + } + }; +#endif diff --git a/vp8/common/entropy.c b/vp8/common/entropy.c index 5fb64df36..62e38d772 100644 --- a/vp8/common/entropy.c +++ b/vp8/common/entropy.c @@ -200,9 +200,13 @@ vp8_extra_bit_struct vp8_extra_bits[12] = }; #include "default_coef_probs.h" +#include "defaultcoefcounts.h" void vp8_default_coef_probs(VP8_COMMON *pc) { +#if CONFIG_T8X8 + int h; +#endif vpx_memcpy(pc->fc.coef_probs, default_coef_probs, sizeof(default_coef_probs)); #if CONFIG_T8X8 diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c index 930e896ce..8507a5a73 100644 --- a/vp8/common/entropymode.c +++ b/vp8/common/entropymode.c @@ -12,11 +12,17 @@ #include "entropymode.h" #include "entropy.h" #include "vpx_mem/vpx_mem.h" - +#if CONFIG_I8X8 +static const unsigned int kf_y_mode_cts[VP8_YMODES] = { 49, 22, 23, 11, 23, 128}; +static const unsigned int y_mode_cts [VP8_YMODES] = { 8080, 1908, 1582, 1007, 0, 5874}; +#else static const unsigned int kf_y_mode_cts[VP8_YMODES] = { 1607, 915, 812, 811, 5455}; static const unsigned int y_mode_cts [VP8_YMODES] = { 8080, 1908, 1582, 1007, 5874}; - +#endif static const unsigned int uv_mode_cts [VP8_UV_MODES] = { 59483, 13605, 16492, 4230}; +#if CONFIG_I8X8 +static const unsigned int i8x8_mode_cts [VP8_UV_MODES] = {93, 69, 81, 13}; +#endif static const unsigned int kf_uv_mode_cts[VP8_UV_MODES] = { 5319, 1904, 1703, 674}; static const unsigned int bmode_cts[VP8_BINTRAMODES] = @@ -117,7 +123,6 @@ const vp8_tree_index vp8_bmode_tree[18] = /* INTRAMODECONTEXTNODE value */ /* Again, these trees use the same probability indices as their explicitly-programmed predecessors. */ - const vp8_tree_index vp8_ymode_tree[8] = { -DC_PRED, 2, @@ -126,14 +131,32 @@ const vp8_tree_index vp8_ymode_tree[8] = -TM_PRED, -B_PRED }; -const vp8_tree_index vp8_kf_ymode_tree[8] = +#if CONFIG_I8X8 +const vp8_tree_index vp8_kf_ymode_tree[10] = { -B_PRED, 2, 4, 6, -DC_PRED, -V_PRED, + -H_PRED, 8, + -TM_PRED, -I8X8_PRED +}; + +const vp8_tree_index vp8_i8x8_mode_tree[6] = +{ + -DC_PRED, 2, + -V_PRED, 4, -H_PRED, -TM_PRED }; +#else +const vp8_tree_index vp8_kf_ymode_tree[8] = +{ + -B_PRED, 2, + 4, 6, + -DC_PRED, -V_PRED, + -H_PRED, -TM_PRED +}; +#endif const vp8_tree_index vp8_uv_mode_tree[6] = { -DC_PRED, 2, @@ -168,6 +191,9 @@ struct vp8_token_struct vp8_bmode_encodings [VP8_BINTRAMODES]; struct vp8_token_struct vp8_ymode_encodings [VP8_YMODES]; struct vp8_token_struct vp8_kf_ymode_encodings [VP8_YMODES]; struct vp8_token_struct vp8_uv_mode_encodings [VP8_UV_MODES]; +#if CONFIG_I8X8 +struct vp8_token_struct vp8_i8x8_mode_encodings [VP8_UV_MODES]; +#endif struct vp8_token_struct vp8_mbsplit_encodings [VP8_NUMMBSPLITS]; struct vp8_token_struct vp8_mv_ref_encoding_array [VP8_MVREFS]; @@ -211,7 +237,15 @@ void vp8_init_mbmode_probs(VP8_COMMON *x) x->kf_uv_mode_prob, bct, kf_uv_mode_cts, 256, 1 ); +#if CONFIG_I8X8 + vp8_tree_probs_from_distribution( + VP8_UV_MODES, vp8_i8x8_mode_encodings, vp8_i8x8_mode_tree, + x->i8x8_mode_prob, bct, i8x8_mode_cts, + 256, 1 + ); +#endif vpx_memcpy(x->fc.sub_mv_ref_prob, sub_mv_ref_prob, sizeof(sub_mv_ref_prob)); + } @@ -262,6 +296,9 @@ void vp8_entropy_mode_init() vp8_tokens_from_tree(vp8_ymode_encodings, vp8_ymode_tree); vp8_tokens_from_tree(vp8_kf_ymode_encodings, vp8_kf_ymode_tree); vp8_tokens_from_tree(vp8_uv_mode_encodings, vp8_uv_mode_tree); +#if CONFIG_I8X8 + vp8_tokens_from_tree(vp8_i8x8_mode_encodings, vp8_i8x8_mode_tree); +#endif vp8_tokens_from_tree(vp8_mbsplit_encodings, vp8_mbsplit_tree); vp8_tokens_from_tree_offset(vp8_mv_ref_encoding_array, diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index fdb170df3..c4dda3ac1 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -38,7 +38,9 @@ extern const vp8_tree_index vp8_bmode_tree[]; extern const vp8_tree_index vp8_ymode_tree[]; extern const vp8_tree_index vp8_kf_ymode_tree[]; extern const vp8_tree_index vp8_uv_mode_tree[]; - +#if CONFIG_I8X8 +extern const vp8_tree_index vp8_i8x8_mode_tree[]; +#endif extern const vp8_tree_index vp8_mbsplit_tree[]; extern const vp8_tree_index vp8_mv_ref_tree[]; extern const vp8_tree_index vp8_sub_mv_ref_tree[]; @@ -46,6 +48,9 @@ extern const vp8_tree_index vp8_sub_mv_ref_tree[]; extern struct vp8_token_struct vp8_bmode_encodings [VP8_BINTRAMODES]; extern struct vp8_token_struct vp8_ymode_encodings [VP8_YMODES]; extern struct vp8_token_struct vp8_kf_ymode_encodings [VP8_YMODES]; +#if CONFIG_I8X8 +extern struct vp8_token_struct vp8_i8x8_mode_encodings [VP8_UV_MODES]; +#endif extern struct vp8_token_struct vp8_uv_mode_encodings [VP8_UV_MODES]; extern struct vp8_token_struct vp8_mbsplit_encodings [VP8_NUMMBSPLITS]; diff --git a/vp8/common/findnearmv.c b/vp8/common/findnearmv.c index c1022363e..189b545fa 100644 --- a/vp8/common/findnearmv.c +++ b/vp8/common/findnearmv.c @@ -51,7 +51,8 @@ void vp8_find_near_mvs if (above->mbmi.mv.as_int) { (++mv)->as_int = above->mbmi.mv.as_int; - mv_bias(ref_frame_sign_bias[above->mbmi.ref_frame], refframe, mv, ref_frame_sign_bias); + mv_bias(ref_frame_sign_bias[above->mbmi.ref_frame], + refframe, mv, ref_frame_sign_bias); ++cntx; } @@ -66,7 +67,8 @@ void vp8_find_near_mvs int_mv this_mv; this_mv.as_int = left->mbmi.mv.as_int; - mv_bias(ref_frame_sign_bias[left->mbmi.ref_frame], refframe, &this_mv, ref_frame_sign_bias); + mv_bias(ref_frame_sign_bias[left->mbmi.ref_frame], + refframe, &this_mv, ref_frame_sign_bias); if (this_mv.as_int != mv->as_int) { @@ -88,7 +90,8 @@ void vp8_find_near_mvs int_mv this_mv; this_mv.as_int = aboveleft->mbmi.mv.as_int; - mv_bias(ref_frame_sign_bias[aboveleft->mbmi.ref_frame], refframe, &this_mv, ref_frame_sign_bias); + mv_bias(ref_frame_sign_bias[aboveleft->mbmi.ref_frame], + refframe, &this_mv, ref_frame_sign_bias); if (this_mv.as_int != mv->as_int) { @@ -149,7 +152,8 @@ vp8_prob *vp8_mv_ref_probs( p[1] = vp8_mode_contexts [near_mv_ref_ct[1]] [1]; p[2] = vp8_mode_contexts [near_mv_ref_ct[2]] [2]; p[3] = vp8_mode_contexts [near_mv_ref_ct[3]] [3]; - /*p[3] = vp8_mode_contexts [near_mv_ref_ct[1] + near_mv_ref_ct[2] + near_mv_ref_ct[3]] [3];*/ + /*p[3] = vp8_mode_contexts [near_mv_ref_ct[1] + + near_mv_ref_ct[2] + near_mv_ref_ct[3]] [3];*/ return p; } diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h index c142a0415..ffc02ed6c 100644 --- a/vp8/common/findnearmv.h +++ b/vp8/common/findnearmv.h @@ -125,8 +125,6 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) --cur_mb; switch (cur_mb->mbmi.mode) { - case B_PRED: - return (cur_mb->bmi + b + 3)->as_mode; case DC_PRED: return B_DC_PRED; case V_PRED: @@ -135,6 +133,11 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) return B_HE_PRED; case TM_PRED: return B_TM_PRED; +#if CONFIG_I8X8 + case I8X8_PRED: +#endif + case B_PRED: + return (cur_mb->bmi + b + 3)->as_mode; default: return B_DC_PRED; } @@ -143,7 +146,8 @@ static B_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) return (cur_mb->bmi + b - 1)->as_mode; } -static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, int b, int mi_stride) +static B_PREDICTION_MODE above_block_mode(const MODE_INFO + *cur_mb, int b, int mi_stride) { if (!(b >> 2)) { @@ -152,8 +156,6 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, int b, int mi switch (cur_mb->mbmi.mode) { - case B_PRED: - return (cur_mb->bmi + b + 12)->as_mode; case DC_PRED: return B_DC_PRED; case V_PRED: @@ -162,6 +164,11 @@ static B_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, int b, int mi return B_HE_PRED; case TM_PRED: return B_TM_PRED; +#if CONFIG_I8X8 + case I8X8_PRED: +#endif + case B_PRED: + return (cur_mb->bmi + b + 12)->as_mode; default: return B_DC_PRED; } diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 1acc0157b..68ed8aab0 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -86,6 +86,9 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->recon.copy8x8 = vp8_copy_mem8x8_c; rtcd->recon.copy8x4 = vp8_copy_mem8x4_c; rtcd->recon.recon = vp8_recon_b_c; +#if CONFIG_I8X8 + rtcd->recon.recon_uv = vp8_recon_uv_b_c; +#endif rtcd->recon.recon2 = vp8_recon2b_c; rtcd->recon.recon4 = vp8_recon4b_c; rtcd->recon.recon_mb = vp8_recon_mb_c; @@ -101,6 +104,14 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->recon.intra4x4_predict = vp8_intra4x4_predict; +#if CONFIG_I8X8 + rtcd->recon.intra8x8_predict = + vp8_intra8x8_predict; + rtcd->recon.intra_uv4x4_predict = + vp8_intra_uv4x4_predict; +#endif + + rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_c; rtcd->subpix.sixtap8x8 = vp8_sixtap_predict8x8_c; rtcd->subpix.sixtap8x4 = vp8_sixtap_predict8x4_c; diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index f84bd6e4a..a2ae35062 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -185,6 +185,9 @@ typedef struct VP8Common vp8_prob kf_bmode_prob [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]; vp8_prob kf_ymode_prob [VP8_YMODES-1]; /* keyframe "" */ vp8_prob kf_uv_mode_prob [VP8_UV_MODES-1]; +#if CONFIG_I8X8 + vp8_prob i8x8_mode_prob [VP8_UV_MODES-1]; +#endif FRAME_CONTEXT lfc; /* last frame entropy */ diff --git a/vp8/common/recon.c b/vp8/common/recon.c index d72d6e410..724d0a3cf 100644 --- a/vp8/common/recon.c +++ b/vp8/common/recon.c @@ -44,6 +44,38 @@ void vp8_recon_b_c } } +#if CONFIG_I8X8 +void vp8_recon_uv_b_c +( + unsigned char *pred_ptr, + short *diff_ptr, + unsigned char *dst_ptr, + int stride +) +{ + int r, c; + + for (r = 0; r < 4; r++) + { + for (c = 0; c < 4; c++) + { + int a = diff_ptr[c] + pred_ptr[c] ; + + if (a < 0) + a = 0; + + if (a > 255) + a = 255; + + dst_ptr[c] = (unsigned char) a ; + } + + dst_ptr += stride; + diff_ptr += 8; + pred_ptr += 8; + } +} +#endif void vp8_recon4b_c ( unsigned char *pred_ptr, diff --git a/vp8/common/recon.h b/vp8/common/recon.h index 7cfc779cd..f459922e7 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -59,6 +59,14 @@ extern prototype_copy_block(vp8_recon_copy8x4); #endif extern prototype_recon_block(vp8_recon_recon); +#if CONFIG_I8X8 +#ifndef vp8_recon_recon_uv +#define vp8_recon_recon_uv vp8_recon_uv_b_c +#endif +extern prototype_recon_block(vp8_recon_recon_uv); +#endif + +extern prototype_recon_block(vp8_recon_recon); #ifndef vp8_recon_recon2 #define vp8_recon_recon2 vp8_recon2b_c #endif @@ -85,6 +93,14 @@ extern prototype_recon_macroblock(vp8_recon_recon_mby); extern prototype_build_intra_predictors\ (vp8_recon_build_intra_predictors_mby); +#if CONFIG_I8X8 +#ifndef vp8_recon_build_intra8x8_predictors_mby +#define vp8_recon_build_intra8x8_predictors_mby vp8_build_intra8x8_predictors_mby +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra8x8_predictors_mby); +#endif + #ifndef vp8_recon_build_intra_predictors_mby_s #define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s #endif @@ -97,6 +113,14 @@ extern prototype_build_intra_predictors\ extern prototype_build_intra_predictors\ (vp8_recon_build_intra_predictors_mbuv); +#if CONFIG_I8X8 +#ifndef vp8_recon_build_intra8x8_predictors_mbuv +#define vp8_recon_build_intra8x8_predictors_mbuv vp8_build_intra8x8_predictors_mbuv +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra8x8_predictors_mbuv); +#endif + #ifndef vp8_recon_build_intra_predictors_mbuv_s #define vp8_recon_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s #endif @@ -109,6 +133,20 @@ extern prototype_build_intra_predictors\ extern prototype_intra4x4_predict\ (vp8_recon_intra4x4_predict); +#if CONFIG_I8X8 +#ifndef vp8_recon_intra8x8_predict +#define vp8_recon_intra8x8_predict vp8_intra8x8_predict +#endif +extern prototype_intra4x4_predict\ + (vp8_recon_intra8x8_predict); + +#ifndef vp8_recon_intra_uv4x4_predict +#define vp8_recon_intra_uv4x4_predict vp8_intra_uv4x4_predict +#endif +extern prototype_intra4x4_predict\ + (vp8_recon_intra_uv4x4_predict); + +#endif typedef prototype_copy_block((*vp8_copy_block_fn_t)); typedef prototype_recon_block((*vp8_recon_fn_t)); @@ -121,6 +159,9 @@ typedef struct vp8_recon_rtcd_vtable vp8_copy_block_fn_t copy8x8; vp8_copy_block_fn_t copy8x4; vp8_recon_fn_t recon; +#if CONFIG_I8X8 + vp8_recon_fn_t recon_uv; +#endif vp8_recon_fn_t recon2; vp8_recon_fn_t recon4; vp8_recon_mb_fn_t recon_mb; @@ -130,6 +171,10 @@ typedef struct vp8_recon_rtcd_vtable vp8_build_intra_pred_fn_t build_intra_predictors_mbuv_s; vp8_build_intra_pred_fn_t build_intra_predictors_mbuv; vp8_intra4x4_pred_fn_t intra4x4_predict; +#if CONFIG_I8X8 + vp8_intra4x4_pred_fn_t intra8x8_predict; + vp8_intra4x4_pred_fn_t intra_uv4x4_predict; +#endif } vp8_recon_rtcd_vtable_t; #if CONFIG_RUNTIME_CPU_DETECT diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index 9cf5f6a88..52ef050dc 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -70,11 +70,7 @@ void vp8_build_intra_predictors_mby(MACROBLOCKD *x) { average += yleft_col[i]; } - } - - - shift = 3 + x->up_available + x->left_available; expected_dc = (average + (1 << (shift - 1))) >> shift; } @@ -135,6 +131,9 @@ void vp8_build_intra_predictors_mby(MACROBLOCKD *x) } break; +#if CONIFG_I8X8 + case I8X8_PRED: +#endif case B_PRED: case NEARESTMV: case NEARMV: @@ -194,8 +193,6 @@ void vp8_build_intra_predictors_mby_s(MACROBLOCKD *x) } - - shift = 3 + x->up_available + x->left_available; expected_dc = (average + (1 << (shift - 1))) >> shift; } @@ -554,3 +551,184 @@ void vp8_build_intra_predictors_mbuv_s(MACROBLOCKD *x) break; } } +#if CONFIG_I8X8 +void vp8_intra8x8_predict(BLOCKD *x, + int mode, + unsigned char *predictor) +{ + + unsigned char *yabove_row = *(x->base_dst) + x->dst - x->dst_stride; + unsigned char yleft_col[8]; + unsigned char ytop_left = yabove_row[-1]; + int r, c, i; + + for (i = 0; i < 8; i++) + { + yleft_col[i] = (*(x->base_dst))[x->dst - 1 + i * x->dst_stride]; + } + switch (mode) + { + case DC_PRED: + { + int expected_dc = 0; + + for (i = 0; i < 8; i++) + { + expected_dc += yabove_row[i]; + expected_dc += yleft_col[i]; + } + expected_dc = (expected_dc + 8) >> 4; + + for (r = 0; r < 8; r++) + { + for (c = 0; c < 8; c++) + { + predictor[c] = expected_dc; + } + predictor += 16; + } + } + break; + case V_PRED: + { + for (r = 0; r < 8; r++) + { + for (c = 0; c < 8; c++) + { + + predictor[c] = yabove_row[c]; + } + predictor += 16; + } + + } + break; + case H_PRED: + { + + for (r = 0; r < 8; r++) + { + for (c = 0; c < 8; c++) + { + predictor[c] = yleft_col[r]; + } + predictor += 16; + } + } + break; + case TM_PRED: + { + /* prediction similar to true_motion prediction */ + for (r = 0; r < 8; r++) + { + for (c = 0; c < 8; c++) + { + int pred = yabove_row[c] - ytop_left + yleft_col[r]; + if (pred < 0) + pred = 0; + + if (pred > 255) + pred = 255; + predictor[c] = pred; + } + + predictor += 16; + } + } + break; + } +} + +void vp8_intra_uv4x4_predict(BLOCKD *x, + int mode, + unsigned char *predictor) +{ + + unsigned char *above_row = *(x->base_dst) + x->dst - x->dst_stride; + unsigned char left_col[4]; + unsigned char top_left = above_row[-1]; + int r, c, i; + + for (i = 0; i < 4; i++) + { + left_col[i] = (*(x->base_dst))[x->dst - 1 + i * x->dst_stride]; + } + switch (mode) + { + case DC_PRED: + { + int expected_dc = 0; + + for (i = 0; i < 4; i++) + { + expected_dc += above_row[i]; + expected_dc += left_col[i]; + } + expected_dc = (expected_dc + 4) >> 3; + + for (r = 0; r < 4; r++) + { + for (c = 0; c < 4; c++) + { + predictor[c] = expected_dc; + } + predictor += 8; + } + } + break; + case V_PRED: + { + for (r = 0; r < 4; r++) + { + for (c = 0; c < 4; c++) + { + + predictor[c] = above_row[c]; + } + predictor += 8; + } + + } + break; + case H_PRED: + { + + for (r = 0; r < 4; r++) + { + for (c = 0; c < 4; c++) + { + predictor[c] = left_col[r]; + } + predictor += 8; + } + } + break; + case TM_PRED: + { + /* prediction similar to true_motion prediction */ + for (r = 0; r < 4; r++) + { + for (c = 0; c < 4; c++) + { + int pred = above_row[c] - top_left + left_col[r]; + if (pred < 0) + pred = 0; + + if (pred > 255) + pred = 255; + predictor[c] = pred; + } + + predictor += 8; + } + } + break; + } +} + + +/* TODO: try different ways of use Y-UV mode correlation + Current code assumes that a uv 4x4 block use same mode + as corresponding Y 8x8 area + */ +#endif |