diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-03-06 04:32:22 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-06 04:32:22 -0800 |
| commit | 72a6201050280193250746227b11021075842d69 (patch) | |
| tree | 4a5c0a1bed126423c15dc00cad271029086ca535 /vp9/encoder/vp9_onyx_if.c | |
| parent | f4e383f3d1fe110437ff62183df24b3eabc59a7d (diff) | |
| parent | db6ad0138c811763d1fcf8e4082834dc92fa9071 (diff) | |
| download | libvpx-72a6201050280193250746227b11021075842d69.tar libvpx-72a6201050280193250746227b11021075842d69.tar.gz libvpx-72a6201050280193250746227b11021075842d69.tar.bz2 libvpx-72a6201050280193250746227b11021075842d69.zip | |
Merge "Added stricter Q control flag." into experimental
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 6335827cf..23e4f8acf 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2845,7 +2845,15 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, cpi->active_best_quality * 15 / 16; } } else { +#ifdef ONE_SHOT_Q_ESTIMATE +#ifdef STRICT_ONE_SHOT_Q + cpi->active_best_quality = Q; +#else cpi->active_best_quality = inter_minq[Q]; +#endif +#else + cpi->active_best_quality = inter_minq[Q]; +#endif // For the constant/constrained quality mode we dont want // q to fall below the cq level. |