diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-01 17:15:11 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-01 17:15:11 -0700 |
| commit | 7c7fc719c9598664b7a234486054057f7263f7cd (patch) | |
| tree | eb7b791e5086e0e899911de2843ee74e7c92f478 /vp9/encoder/vp9_onyx_if.c | |
| parent | 06159fcd18b3438bb703a2baff4019aa6393b267 (diff) | |
| parent | 7bcfa31750865ec07c36ae2a1e66c3059983a1bb (diff) | |
| download | libvpx-7c7fc719c9598664b7a234486054057f7263f7cd.tar libvpx-7c7fc719c9598664b7a234486054057f7263f7cd.tar.gz libvpx-7c7fc719c9598664b7a234486054057f7263f7cd.tar.bz2 libvpx-7c7fc719c9598664b7a234486054057f7263f7cd.zip | |
Merge "Moving encoder quantization parameters into separate struct."
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index dfef25d73..6cfd98757 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2242,7 +2242,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi, int q) { VP9_COMMON *const cm = &cpi->common; vp9_clear_system_state(); - vp9_set_quantizer(cpi, q); + vp9_set_quantizer(cm, q); // Set up entropy context depending on frame type. The decoder mandates // the use of the default context, index 0, for keyframes and inter @@ -2253,7 +2253,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi, setup_key_frame(cpi); } else { if (!cm->intra_only && !cm->error_resilient_mode && !cpi->use_svc) - cpi->common.frame_context_idx = cpi->refresh_alt_ref_frame; + cm->frame_context_idx = cpi->refresh_alt_ref_frame; setup_inter_frame(cm); } @@ -2299,7 +2299,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, do { vp9_clear_system_state(); - vp9_set_quantizer(cpi, q); + vp9_set_quantizer(cm, q); if (loop_count == 0) { // Set up entropy context depending on frame type. The decoder mandates @@ -2873,7 +2873,7 @@ static void Pass1Encode(VP9_COMP *cpi, size_t *size, uint8_t *dest, (void) frame_flags; vp9_rc_get_first_pass_params(cpi); - vp9_set_quantizer(cpi, find_fp_qindex()); + vp9_set_quantizer(&cpi->common, find_fp_qindex()); vp9_first_pass(cpi); } |