diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-12-03 12:05:48 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-03 12:05:48 -0800 |
| commit | 9961ad479a475fb035bfc3c46059abe0436ed57b (patch) | |
| tree | 7d98d25ba1eae4632970b6109d7102eca621505f /vp8/encoder/encodeframe.c | |
| parent | 7891fb5eda2b086060cf71ff76ddea6aaa8acc1c (diff) | |
| parent | fe91e47bc781be9e5085137dc34b09d3358963a7 (diff) | |
| download | libvpx-9961ad479a475fb035bfc3c46059abe0436ed57b.tar libvpx-9961ad479a475fb035bfc3c46059abe0436ed57b.tar.gz libvpx-9961ad479a475fb035bfc3c46059abe0436ed57b.tar.bz2 libvpx-9961ad479a475fb035bfc3c46059abe0436ed57b.zip | |
Merge "Moving rd_thresh_mult, rd_threshes to macroblock struct"
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 1a234ca29..d91f1c696 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -45,7 +45,6 @@ extern void vp8_auto_select_speed(VP8_COMP *cpi); extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi, MACROBLOCK *x, MB_ROW_COMP *mbr_ei, - int mb_row, int count); static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ); @@ -765,7 +764,7 @@ void vp8_encode_frame(VP8_COMP *cpi) vp8cx_frame_init_quantizer(cpi); - vp8_initialize_rd_consts(cpi, + vp8_initialize_rd_consts(cpi, x, vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q)); vp8cx_initialize_me_consts(cpi, cm->base_qindex); @@ -804,7 +803,8 @@ void vp8_encode_frame(VP8_COMP *cpi) { int i; - vp8cx_init_mbrthread_data(cpi, x, cpi->mb_row_ei, 1, cpi->encoding_thread_count); + vp8cx_init_mbrthread_data(cpi, x, cpi->mb_row_ei, + cpi->encoding_thread_count); for (i = 0; i < cm->mb_rows; i++) cpi->mt_current_mb_col[i] = -1; |