From 7bcfa31750865ec07c36ae2a1e66c3059983a1bb Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 28 Mar 2014 16:46:41 -0700 Subject: Moving encoder quantization parameters into separate struct. Change-Id: I2a169535489aeda3943fb5a46ab53e7a12abaa36 --- vp9/encoder/vp9_onyx_if.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vp9/encoder/vp9_onyx_if.c') diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 78c7f8ead..8b0f3cf3a 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2231,7 +2231,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 @@ -2242,7 +2242,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); } @@ -2288,7 +2288,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 @@ -2840,7 +2840,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); } -- cgit v1.2.3