From 6a8ec3eac29d7937c7b8c0d45e272dd98aae8188 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Thu, 8 Aug 2013 14:52:39 -0700 Subject: General code cleanup. Removing redundant parenthesis and curly braces. Combining declarations with initializations. Adding useful intermediate variables instead of recalculating expressions every time. Change-Id: I00106f404afd60bfc189905b0fded881684f941a --- vp9/common/vp9_entropy.c | 2 +- vp9/common/vp9_entropymode.c | 6 ++---- vp9/common/vp9_reconintra.c | 48 ++++++++++++++++++-------------------------- 3 files changed, 23 insertions(+), 33 deletions(-) (limited to 'vp9/common') diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index d8b20a553..21e0e0471 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -377,7 +377,7 @@ static const vp9_prob modelcoefprobs_pareto8[COEFPROB_MODELS][MODEL_NODES] = { static void extend_model_to_full_distribution(vp9_prob p, vp9_prob *tree_probs) { - const int l = ((p - 1) / 2); + const int l = (p - 1) / 2; const vp9_prob (*model)[MODEL_NODES] = modelcoefprobs_pareto8; if (p & 1) { vpx_memcpy(tree_probs + UNCONSTRAINED_NODES, diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index c84b9e393..7c232f05b 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -440,14 +440,12 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) { fc->tx_probs.p8x8[i][j] = update_ct2(pre_fc->tx_probs.p8x8[i][j], branch_ct_8x8p[j]); - tx_counts_to_branch_counts_16x16(counts->tx.p16x16[i], - branch_ct_16x16p); + tx_counts_to_branch_counts_16x16(counts->tx.p16x16[i], branch_ct_16x16p); for (j = 0; j < TX_SIZES - 2; ++j) fc->tx_probs.p16x16[i][j] = update_ct2(pre_fc->tx_probs.p16x16[i][j], branch_ct_16x16p[j]); - tx_counts_to_branch_counts_32x32(counts->tx.p32x32[i], - branch_ct_32x32p); + tx_counts_to_branch_counts_32x32(counts->tx.p32x32[i], branch_ct_32x32p); for (j = 0; j < TX_SIZES - 1; ++j) fc->tx_probs.p32x32[i][j] = update_ct2(pre_fc->tx_probs.p32x32[i][j], branch_ct_32x32p[j]); diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index f351224a7..6209e1815 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -51,18 +51,17 @@ static INLINE void d27_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, uint8_t *above_row, uint8_t *left_col) { int r, c; // first column - for (r = 0; r < bs - 1; ++r) { - pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + - left_col[r + 1], 1); - } + for (r = 0; r < bs - 1; ++r) + pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + left_col[r + 1], 1); + pred_ptr[(bs - 1) * stride] = left_col[bs - 1]; pred_ptr++; // second column - for (r = 0; r < bs - 2; ++r) { - pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + - left_col[r + 1] * 2 + - left_col[r + 2], 2); - } + for (r = 0; r < bs - 2; ++r) + pred_ptr[r * stride] = ROUND_POWER_OF_TWO(left_col[r] + + left_col[r + 1] * 2 + + left_col[r + 2], 2); + pred_ptr[(bs - 2) * stride] = ROUND_POWER_OF_TWO(left_col[bs - 2] + left_col[bs - 1] * 3, 2); @@ -70,15 +69,12 @@ static INLINE void d27_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, pred_ptr++; // rest of last row - for (c = 0; c < bs - 2; ++c) { + for (c = 0; c < bs - 2; ++c) pred_ptr[(bs - 1) * stride + c] = left_col[bs - 1]; - } - for (r = bs - 2; r >= 0; --r) { - for (c = 0; c < bs - 2; ++c) { + for (r = bs - 2; r >= 0; --r) + for (c = 0; c < bs - 2; ++c) pred_ptr[r * stride + c] = pred_ptr[(r + 1) * stride + c - 2]; - } - } } intra_pred_allsizes(d27) @@ -86,16 +82,12 @@ static INLINE void d63_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, uint8_t *above_row, uint8_t *left_col) { int r, c; for (r = 0; r < bs; ++r) { - for (c = 0; c < bs; ++c) { - if (r & 1) { - pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[r/2 + c] + - above_row[r/2 + c + 1] * 2 + - above_row[r/2 + c + 2], 2); - } else { - pred_ptr[c] = ROUND_POWER_OF_TWO(above_row[r/2 + c] + - above_row[r/2+ c + 1], 1); - } - } + for (c = 0; c < bs; ++c) + pred_ptr[c] = r & 1 ? ROUND_POWER_OF_TWO(above_row[r/2 + c] + + above_row[r/2 + c + 1] * 2 + + above_row[r/2 + c + 2], 2) + : ROUND_POWER_OF_TWO(above_row[r/2 + c] + + above_row[r/2+ c + 1], 1); pred_ptr += stride; } } @@ -141,9 +133,9 @@ static INLINE void d117_predictor(uint8_t *pred_ptr, ptrdiff_t stride, int bs, left_col[0] * 2 + left_col[1], 2); for (r = 3; r < bs; ++r) - pred_ptr[(r-2) * stride] = ROUND_POWER_OF_TWO(left_col[r - 3] + - left_col[r - 2] * 2 + - left_col[r - 1], 2); + pred_ptr[(r - 2) * stride] = ROUND_POWER_OF_TWO(left_col[r - 3] + + left_col[r - 2] * 2 + + left_col[r - 1], 2); // the rest of the block for (r = 2; r < bs; ++r) { for (c = 1; c < bs; c++) -- cgit v1.2.3