summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
Diffstat (limited to 'vp8')
-rw-r--r--vp8/common/entropymode.c13
-rw-r--r--vp8/common/entropymode.h13
-rw-r--r--vp8/common/onyxc_int.h4
-rw-r--r--vp8/decoder/error_concealment.c4
-rw-r--r--vp8/encoder/firstpass.c4
-rw-r--r--vp8/encoder/mcomp.c24
-rw-r--r--vp8/encoder/pickinter.c4
-rw-r--r--vp8/encoder/ratectrl.c52
-rw-r--r--vp8/encoder/rdopt.c18
-rw-r--r--vp8/encoder/vp8_quantize.c8
10 files changed, 74 insertions, 70 deletions
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c
index 239492a8c..30c2fa86a 100644
--- a/vp8/common/entropymode.c
+++ b/vp8/common/entropymode.c
@@ -34,13 +34,12 @@ int vp8_mv_cont(const int_mv *l, const int_mv *a) {
static const vp8_prob sub_mv_ref_prob[VP8_SUBMVREFS - 1] = { 180, 162, 25 };
-const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT][VP8_SUBMVREFS - 1] = {
- { 147, 136, 18 },
- { 106, 145, 1 },
- { 179, 121, 1 },
- { 223, 1, 34 },
- { 208, 1, 1 }
-};
+const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT]
+ [VP8_SUBMVREFS - 1] = { { 147, 136, 18 },
+ { 106, 145, 1 },
+ { 179, 121, 1 },
+ { 223, 1, 34 },
+ { 208, 1, 1 } };
const vp8_mbsplit vp8_mbsplits[VP8_NUMMBSPLITS] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 },
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h
index 9331eb225..e0a17df10 100644
--- a/vp8/common/entropymode.h
+++ b/vp8/common/entropymode.h
@@ -40,8 +40,9 @@ extern int vp8_mv_cont(const int_mv *l, const int_mv *a);
#define SUBMVREF_COUNT 5
extern const vp8_prob vp8_sub_mv_ref_prob2[SUBMVREF_COUNT][VP8_SUBMVREFS - 1];
-extern const unsigned int vp8_kf_default_bmode_counts
- [VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES];
+extern const unsigned int vp8_kf_default_bmode_counts[VP8_BINTRAMODES]
+ [VP8_BINTRAMODES]
+ [VP8_BINTRAMODES];
extern const vp8_tree_index vp8_bmode_tree[];
@@ -70,15 +71,15 @@ extern const vp8_tree_index vp8_small_mvtree[];
extern const struct vp8_token_struct vp8_small_mvencodings[8];
/* Key frame default mode probs */
-extern const vp8_prob
- vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES - 1];
+extern const vp8_prob vp8_kf_bmode_prob[VP8_BINTRAMODES][VP8_BINTRAMODES]
+ [VP8_BINTRAMODES - 1];
extern const vp8_prob vp8_kf_uv_mode_prob[VP8_UV_MODES - 1];
extern const vp8_prob vp8_kf_ymode_prob[VP8_YMODES - 1];
void vp8_init_mbmode_probs(VP8_COMMON *x);
void vp8_default_bmode_probs(vp8_prob dest[VP8_BINTRAMODES - 1]);
-void vp8_kf_default_bmode_probs(
- vp8_prob dest[VP8_BINTRAMODES][VP8_BINTRAMODES][VP8_BINTRAMODES - 1]);
+void vp8_kf_default_bmode_probs(vp8_prob dest[VP8_BINTRAMODES][VP8_BINTRAMODES]
+ [VP8_BINTRAMODES - 1]);
#ifdef __cplusplus
} // extern "C"
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index 6d3de4f1a..732656f2f 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -42,8 +42,8 @@ typedef struct frame_contexts {
vp8_prob ymode_prob[VP8_YMODES - 1]; /* interframe intra mode probs */
vp8_prob uv_mode_prob[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[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
+ [ENTROPY_NODES];
MV_CONTEXT mvc[2];
} FRAME_CONTEXT;
diff --git a/vp8/decoder/error_concealment.c b/vp8/decoder/error_concealment.c
index df292f21d..e22141492 100644
--- a/vp8/decoder/error_concealment.c
+++ b/vp8/decoder/error_concealment.c
@@ -435,8 +435,8 @@ static void interpolate_mvs(MACROBLOCKD *mb, EC_BLOCK *neighbors,
/* Calculate the weighted sum of neighboring MVs referring
* to the dominant frame type.
*/
- const int w = weights_q7[abs(row - neigh_pos[i].row)][abs(
- col - neigh_pos[i].col)];
+ const int w = weights_q7[abs(row - neigh_pos[i].row)]
+ [abs(col - neigh_pos[i].col)];
if (neighbors[i].ref_frame != dom_ref_frame) continue;
w_sum += w;
/* Q7 * Q3 = Q10 */
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index a175d1a23..cd34e33fb 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -53,8 +53,8 @@ extern const int vp8_gf_boost_qadjustment[QINDEX_RANGE];
#define DOUBLE_DIVIDE_CHECK(X) ((X) < 0 ? (X)-.000001 : (X) + .000001)
-#define POW1 (double) cpi->oxcf.two_pass_vbrbias / 100.0
-#define POW2 (double) cpi->oxcf.two_pass_vbrbias / 100.0
+#define POW1 (double)cpi->oxcf.two_pass_vbrbias / 100.0
+#define POW2 (double)cpi->oxcf.two_pass_vbrbias / 100.0
#define NEW_BOOST 1
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index 5cdfa62f8..970120f3b 100644
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -206,17 +206,19 @@ void vp8_init3smotion_compensation(MACROBLOCK *x, int stride) {
/* returns distortion + motion vector cost */
#define ERR(r, c) (MVC(r, c) + DIST(r, c))
/* checks if (r,c) has better score than previous best */
-#define CHECK_BETTER(v, r, c) \
- IFMVCV(r, c, { \
- thismse = DIST(r, c); \
- if ((v = (MVC(r, c) + thismse)) < besterr) { \
- besterr = v; \
- br = r; \
- bc = c; \
- *distortion = thismse; \
- *sse1 = sse; \
- } \
- }, v = UINT_MAX;)
+#define CHECK_BETTER(v, r, c) \
+ IFMVCV(r, c, \
+ { \
+ thismse = DIST(r, c); \
+ if ((v = (MVC(r, c) + thismse)) < besterr) { \
+ besterr = v; \
+ br = r; \
+ bc = c; \
+ *distortion = thismse; \
+ *sse1 = sse; \
+ } \
+ }, \
+ v = UINT_MAX;)
int vp8_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
int_mv *bestmv, int_mv *ref_mv,
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index 7948657fc..f0050d201 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -976,8 +976,8 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
xd->dst.y_stride, xd->predictor, 16);
distortion2 = vpx_variance16x16(*(b->base_src), b->src_stride,
x->e_mbd.predictor, 16, &sse);
- rate2 += x->mbmode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context
- ->mbmi.mode];
+ rate2 += x->mbmode_cost[x->e_mbd.frame_type]
+ [x->e_mbd.mode_info_context->mbmi.mode];
this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
if (this_rd < best_intra_rd) {
diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c
index d1e65487b..649f696dc 100644
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -49,36 +49,38 @@ const int vp8_bits_per_mb[2][QINDEX_RANGE] = {
/* Intra case 450000/Qintra */
{
1125000, 900000, 750000, 642857, 562500, 500000, 450000, 450000, 409090,
- 375000, 346153, 321428, 300000, 281250, 264705, 264705, 250000, 236842,
- 225000, 225000, 214285, 214285, 204545, 204545, 195652, 195652, 187500,
- 180000, 180000, 173076, 166666, 160714, 155172, 150000, 145161, 140625,
- 136363, 132352, 128571, 125000, 121621, 121621, 118421, 115384, 112500,
- 109756, 107142, 104651, 102272, 100000, 97826, 97826, 95744, 93750, 91836,
- 90000, 88235, 86538, 84905, 83333, 81818, 80357, 78947, 77586, 76271,
- 75000, 73770, 72580, 71428, 70312, 69230, 68181, 67164, 66176, 65217,
- 64285, 63380, 62500, 61643, 60810, 60000, 59210, 59210, 58441, 57692,
- 56962, 56250, 55555, 54878, 54216, 53571, 52941, 52325, 51724, 51136,
- 50561, 49450, 48387, 47368, 46875, 45918, 45000, 44554, 44117, 43269,
- 42452, 41666, 40909, 40178, 39473, 38793, 38135, 36885, 36290, 35714,
- 35156, 34615, 34090, 33582, 33088, 32608, 32142, 31468, 31034, 30405,
- 29801, 29220, 28662,
+ 375000, 346153, 321428, 300000, 281250, 264705, 264705, 250000, 236842,
+ 225000, 225000, 214285, 214285, 204545, 204545, 195652, 195652, 187500,
+ 180000, 180000, 173076, 166666, 160714, 155172, 150000, 145161, 140625,
+ 136363, 132352, 128571, 125000, 121621, 121621, 118421, 115384, 112500,
+ 109756, 107142, 104651, 102272, 100000, 97826, 97826, 95744, 93750,
+ 91836, 90000, 88235, 86538, 84905, 83333, 81818, 80357, 78947,
+ 77586, 76271, 75000, 73770, 72580, 71428, 70312, 69230, 68181,
+ 67164, 66176, 65217, 64285, 63380, 62500, 61643, 60810, 60000,
+ 59210, 59210, 58441, 57692, 56962, 56250, 55555, 54878, 54216,
+ 53571, 52941, 52325, 51724, 51136, 50561, 49450, 48387, 47368,
+ 46875, 45918, 45000, 44554, 44117, 43269, 42452, 41666, 40909,
+ 40178, 39473, 38793, 38135, 36885, 36290, 35714, 35156, 34615,
+ 34090, 33582, 33088, 32608, 32142, 31468, 31034, 30405, 29801,
+ 29220, 28662,
},
/* Inter case 285000/Qinter */
{
712500, 570000, 475000, 407142, 356250, 316666, 285000, 259090, 237500,
219230, 203571, 190000, 178125, 167647, 158333, 150000, 142500, 135714,
- 129545, 123913, 118750, 114000, 109615, 105555, 101785, 98275, 95000,
- 91935, 89062, 86363, 83823, 81428, 79166, 77027, 75000, 73076, 71250,
- 69512, 67857, 66279, 64772, 63333, 61956, 60638, 59375, 58163, 57000,
- 55882, 54807, 53773, 52777, 51818, 50892, 50000, 49137, 47500, 45967,
- 44531, 43181, 41911, 40714, 39583, 38513, 37500, 36538, 35625, 34756,
- 33928, 33139, 32386, 31666, 30978, 30319, 29687, 29081, 28500, 27941,
- 27403, 26886, 26388, 25909, 25446, 25000, 24568, 23949, 23360, 22800,
- 22265, 21755, 21268, 20802, 20357, 19930, 19520, 19127, 18750, 18387,
- 18037, 17701, 17378, 17065, 16764, 16473, 16101, 15745, 15405, 15079,
- 14766, 14467, 14179, 13902, 13636, 13380, 13133, 12895, 12666, 12445,
- 12179, 11924, 11632, 11445, 11220, 11003, 10795, 10594, 10401, 10215,
- 10035,
+ 129545, 123913, 118750, 114000, 109615, 105555, 101785, 98275, 95000,
+ 91935, 89062, 86363, 83823, 81428, 79166, 77027, 75000, 73076,
+ 71250, 69512, 67857, 66279, 64772, 63333, 61956, 60638, 59375,
+ 58163, 57000, 55882, 54807, 53773, 52777, 51818, 50892, 50000,
+ 49137, 47500, 45967, 44531, 43181, 41911, 40714, 39583, 38513,
+ 37500, 36538, 35625, 34756, 33928, 33139, 32386, 31666, 30978,
+ 30319, 29687, 29081, 28500, 27941, 27403, 26886, 26388, 25909,
+ 25446, 25000, 24568, 23949, 23360, 22800, 22265, 21755, 21268,
+ 20802, 20357, 19930, 19520, 19127, 18750, 18387, 18037, 17701,
+ 17378, 17065, 16764, 16473, 16101, 15745, 15405, 15079, 14766,
+ 14467, 14179, 13902, 13636, 13380, 13133, 12895, 12666, 12445,
+ 12179, 11924, 11632, 11445, 11220, 11003, 10795, 10594, 10401,
+ 10215, 10035,
}
};
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index bba4fa8ea..9ba301e08 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -105,10 +105,11 @@ const int vp8_ref_frame_order[MAX_MODES] = {
0,
};
-static void fill_token_costs(
- int c[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS],
- const vp8_prob
- p[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES]) {
+static void fill_token_costs(int c[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS]
+ [MAX_ENTROPY_TOKENS],
+ const vp8_prob p[BLOCK_TYPES][COEF_BANDS]
+ [PREV_COEF_CONTEXTS]
+ [ENTROPY_NODES]) {
int i, j, k;
for (i = 0; i < BLOCK_TYPES; ++i) {
@@ -766,8 +767,8 @@ static void rd_pick_intra_mbuv_mode(MACROBLOCK *x, int *rate,
rate_to = rd_cost_mbuv(x);
this_rate = rate_to +
- x->intra_uv_mode_cost[xd->frame_type][xd->mode_info_context
- ->mbmi.uv_mode];
+ x->intra_uv_mode_cost[xd->frame_type]
+ [xd->mode_info_context->mbmi.uv_mode];
this_distortion = vp8_mbuverror(x) / 4;
@@ -1999,9 +2000,8 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
macro_block_yrd(x, &rd.rate_y, &distortion);
rd.rate2 += rd.rate_y;
rd.distortion2 += distortion;
- rd.rate2 +=
- x->mbmode_cost[x->e_mbd.frame_type][x->e_mbd.mode_info_context->mbmi
- .mode];
+ rd.rate2 += x->mbmode_cost[x->e_mbd.frame_type]
+ [x->e_mbd.mode_info_context->mbmi.mode];
rd.rate2 += uv_intra_rate;
rd.rate_uv = uv_intra_rate_tokenonly;
rd.distortion2 += uv_intra_distortion;
diff --git a/vp8/encoder/vp8_quantize.c b/vp8/encoder/vp8_quantize.c
index 2bcb53cc3..ff6e04eaa 100644
--- a/vp8/encoder/vp8_quantize.c
+++ b/vp8/encoder/vp8_quantize.c
@@ -297,13 +297,13 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip) {
if (xd->segmentation_enabled) {
/* Abs Value */
if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA) {
- QIndex = xd->segment_feature_data[MB_LVL_ALT_Q][xd->mode_info_context
- ->mbmi.segment_id];
+ QIndex = xd->segment_feature_data[MB_LVL_ALT_Q]
+ [xd->mode_info_context->mbmi.segment_id];
/* Delta Value */
} else {
QIndex = cpi->common.base_qindex +
- xd->segment_feature_data[MB_LVL_ALT_Q][xd->mode_info_context
- ->mbmi.segment_id];
+ xd->segment_feature_data[MB_LVL_ALT_Q]
+ [xd->mode_info_context->mbmi.segment_id];
/* Clamp to valid range */
QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 01:23:50 +0000