diff options
| author | James Zern <jzern@google.com> | 2016-08-04 20:01:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-08-04 20:01:46 +0000 |
| commit | 4db9bd324d3da67be606ab7f3befeffde261143c (patch) | |
| tree | 2b1db6459052193c5d174409aeed3253375d5551 | |
| parent | caac87b05b673fa02609c7abe7fee2cf6d68369e (diff) | |
| parent | 3a4002b94d3b6ea589fb3b087e95a220c5f2b36c (diff) | |
| download | libvpx-4db9bd324d3da67be606ab7f3befeffde261143c.tar libvpx-4db9bd324d3da67be606ab7f3befeffde261143c.tar.gz libvpx-4db9bd324d3da67be606ab7f3befeffde261143c.tar.bz2 libvpx-4db9bd324d3da67be606ab7f3befeffde261143c.zip | |
Merge "vp9_ratectrl.c: apply clang-format"
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 6105f81f2..5daad7458 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -2115,9 +2115,9 @@ void adjust_gf_boost_lag_one_pass_vbr(VP9_COMP *cpi, uint64_t avg_sad_current) { VPXMIN(15, (3 * rc->baseline_gf_interval) >> 1); } else if (high_content) { rc->gfu_boost = DEFAULT_GF_BOOST >> 1; - rc->baseline_gf_interval = (rate_err > 3.0) ? - VPXMAX(10, rc->baseline_gf_interval >> 1) : - VPXMAX(6, rc->baseline_gf_interval >> 1); + rc->baseline_gf_interval = (rate_err > 3.0) + ? VPXMAX(10, rc->baseline_gf_interval >> 1) + : VPXMAX(6, rc->baseline_gf_interval >> 1); } // Check for constraining gf_interval for up-coming scene/content changes, // or for up-coming key frame, whichever is closer. |