diff options
| author | Attila Nagy <attilanagy@google.com> | 2012-05-04 13:32:43 +0300 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-05-04 10:44:46 -0700 |
| commit | 3e32105d63c0a15198b0b4e1172c1c934e1c5b7d (patch) | |
| tree | 70eda5544b59610cce30b9231a2388488c635c54 /vp8 | |
| parent | 2bf8fb58894da0136cd6d97236241e0692cb34c8 (diff) | |
| download | libvpx-3e32105d63c0a15198b0b4e1172c1c934e1c5b7d.tar libvpx-3e32105d63c0a15198b0b4e1172c1c934e1c5b7d.tar.gz libvpx-3e32105d63c0a15198b0b4e1172c1c934e1c5b7d.tar.bz2 libvpx-3e32105d63c0a15198b0b4e1172c1c934e1c5b7d.zip | |
Fix multi-resolution threaded encoding
mb_row and mb_col was not passed to vp8cx_encode_inter_macroblock in
threaded encoding.
Change-Id: If4321cc59bf91e991aa31e772f882ed5f2bbb201
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 12 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 962a719c8..d6b0ba8e0 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -48,8 +48,11 @@ extern void vp8cx_init_mbrthread_data(VP8_COMP *cpi, int count); void vp8_build_block_offsets(MACROBLOCK *x); void vp8_setup_block_ptrs(MACROBLOCK *x); -int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, int recon_yoffset, int recon_uvoffset, int mb_row, int mb_col); -int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, int mb_row, int mb_col); +int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, + int recon_yoffset, int recon_uvoffset, + int mb_row, int mb_col); +int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, + TOKENEXTRA **t); static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ); #ifdef MODE_STATS @@ -493,7 +496,7 @@ void encode_mb_row(VP8_COMP *cpi, if (cm->frame_type == KEY_FRAME) { - *totalrate += vp8cx_encode_intra_macro_block(cpi, x, tp, mb_row, mb_col); + *totalrate += vp8cx_encode_intra_macroblock(cpi, x, tp); #ifdef MODE_STATS y_modes[xd->mbmi.mode] ++; #endif @@ -1117,8 +1120,7 @@ static void adjust_act_zbin( VP8_COMP *cpi, MACROBLOCK *x ) #endif } -int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, - int mb_row, int mb_col) +int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) { MACROBLOCKD *xd = &x->e_mbd; int rate; diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index b549a7dca..baa29cf46 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -18,10 +18,11 @@ #if CONFIG_MULTITHREAD extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, - TOKENEXTRA **t, int recon_yoffset, - int recon_uvoffset); -extern int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, - TOKENEXTRA **t); + TOKENEXTRA **t, + int recon_yoffset, int recon_uvoffset, + int mb_row, int mb_col); +extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, + TOKENEXTRA **t); extern void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x, int ok_to_skip); extern void vp8_build_block_offsets(MACROBLOCK *x); extern void vp8_setup_block_ptrs(MACROBLOCK *x); @@ -186,14 +187,14 @@ THREAD_FUNCTION thread_encoding_proc(void *p_data) if (cm->frame_type == KEY_FRAME) { - *totalrate += vp8cx_encode_intra_macro_block(cpi, x, &tp); + *totalrate += vp8cx_encode_intra_macroblock(cpi, x, &tp); #ifdef MODE_STATS y_modes[xd->mbmi.mode] ++; #endif } else { - *totalrate += vp8cx_encode_inter_macroblock(cpi, x, &tp, recon_yoffset, recon_uvoffset); + *totalrate += vp8cx_encode_inter_macroblock(cpi, x, &tp, recon_yoffset, recon_uvoffset, mb_row, mb_col); #ifdef MODE_STATS inter_y_modes[xd->mbmi.mode] ++; |