summaryrefslogtreecommitdiff
path: root/vp8/encoder/encodeframe.c
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2012-11-06 16:27:00 -0800
committerScott LaVarnway <slavarnway@google.com>2012-11-06 16:27:00 -0800
commitfe91e47bc781be9e5085137dc34b09d3358963a7 (patch)
tree66936c99574d50a40bb62e8471949549aabb6a7d /vp8/encoder/encodeframe.c
parentee28bb87b47094abb9cb7549d5a14f3cdf0955d3 (diff)
downloadlibvpx-fe91e47bc781be9e5085137dc34b09d3358963a7.tar
libvpx-fe91e47bc781be9e5085137dc34b09d3358963a7.tar.gz
libvpx-fe91e47bc781be9e5085137dc34b09d3358963a7.tar.bz2
libvpx-fe91e47bc781be9e5085137dc34b09d3358963a7.zip
Moving rd_thresh_mult, rd_threshes to macroblock struct
Change-Id: I650a593162280ab40e71e527ec6518303e2d5723
Diffstat (limited to 'vp8/encoder/encodeframe.c')
-rw-r--r--vp8/encoder/encodeframe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 732b77b66..942a381af 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 );
@@ -766,7 +765,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);
@@ -805,7 +804,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;