diff options
| author | Attila Nagy <attilanagy@google.com> | 2012-05-04 13:32:43 +0300 |
|---|---|---|
| committer | Attila Nagy <attilanagy@google.com> | 2012-05-04 13:32:43 +0300 |
| commit | 357800e7cd5b6b71a2960c4f685e2c2bfff10212 (patch) | |
| tree | 8ed47b90eebfd443bb58ffd8bf367edb9a00a652 /vp8/encoder/encodeframe.c | |
| parent | 25a36d6b3c6d206ad19d47f9999eb71109f87dea (diff) | |
| download | libvpx-357800e7cd5b6b71a2960c4f685e2c2bfff10212.tar libvpx-357800e7cd5b6b71a2960c4f685e2c2bfff10212.tar.gz libvpx-357800e7cd5b6b71a2960c4f685e2c2bfff10212.tar.bz2 libvpx-357800e7cd5b6b71a2960c4f685e2c2bfff10212.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/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 1f4019772..5c607d961 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; |