diff options
| author | clang-format <noreply@google.com> | 2017-02-13 20:06:18 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-02-14 12:45:52 -0800 |
| commit | 4b402746cad6f9dbebbb3c3b79a2da098385d46f (patch) | |
| tree | 2aaf26124679e2317f031b14d4cba46502c98a01 /vp8 | |
| parent | f670628ca546883b1989203a38835c27d3e130b7 (diff) | |
| download | libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar.gz libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.tar.bz2 libvpx-4b402746cad6f9dbebbb3c3b79a2da098385d46f.zip | |
apply clang-format
Change-Id: I75e4a9e0b37bd4586f26c8d6c1fa27f3f6ff1bce
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/entropymode.c | 13 | ||||
| -rw-r--r-- | vp8/common/entropymode.h | 4 | ||||
| -rw-r--r-- | vp8/encoder/firstpass.c | 6 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 9 |
5 files changed, 19 insertions, 19 deletions
diff --git a/vp8/common/entropymode.c b/vp8/common/entropymode.c index 30c2fa86a..239492a8c 100644 --- a/vp8/common/entropymode.c +++ b/vp8/common/entropymode.c @@ -34,12 +34,13 @@ 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 e0a17df10..b3fad19be 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -78,8 +78,8 @@ 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/encoder/firstpass.c b/vp8/encoder/firstpass.c index 884d6e18b..caf19059e 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -1185,9 +1185,9 @@ static int estimate_kf_group_q(VP8_COMP *cpi, double section_err, current_spend_ratio = (double)cpi->long_rolling_actual_bits / (double)cpi->long_rolling_target_bits; current_spend_ratio = - (current_spend_ratio > 10.0) ? 10.0 : (current_spend_ratio < 0.1) - ? 0.1 - : current_spend_ratio; + (current_spend_ratio > 10.0) + ? 10.0 + : (current_spend_ratio < 0.1) ? 0.1 : current_spend_ratio; } /* Calculate a correction factor based on the quality of prediction in diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 37907855b..0a1e1bbc7 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4061,9 +4061,9 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size, #if !CONFIG_REALTIME_ONLY top_index = cpi->active_worst_quality; #endif // !CONFIG_REALTIME_ONLY - /* If we have updated the active max Q do not call - * vp8_update_rate_correction_factors() this loop. - */ + /* If we have updated the active max Q do not call + * vp8_update_rate_correction_factors() this loop. + */ active_worst_qchanged = 1; } else { active_worst_qchanged = 0; diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index b08a573f6..3792b10f8 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -107,11 +107,10 @@ 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) { |