diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-15 15:21:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-15 15:21:09 -0700 |
| commit | 9451e8d37e89eb32f91fb844bf2ba31d16bc1526 (patch) | |
| tree | 1fcf1b88182ffedb868823a0adc68ad9397d2171 /vp9/encoder/vp9_rdopt.c | |
| parent | 939b1e4a8c7b1486bed570001915c34ca5605f64 (diff) | |
| parent | bb3b817c1e64e4f1460db0d5b3c65f44273c0944 (diff) | |
| download | libvpx-9451e8d37e89eb32f91fb844bf2ba31d16bc1526.tar libvpx-9451e8d37e89eb32f91fb844bf2ba31d16bc1526.tar.gz libvpx-9451e8d37e89eb32f91fb844bf2ba31d16bc1526.tar.bz2 libvpx-9451e8d37e89eb32f91fb844bf2ba31d16bc1526.zip | |
Merge "Converting code from using ss_txfrm_size to tx_size."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a6964e43c..87a114528 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -599,11 +599,10 @@ static void dist_block(int plane, int block, BLOCK_SIZE_TYPE bsize, static void rate_block(int plane, int block, BLOCK_SIZE_TYPE bsize, int ss_txfrm_size, void *arg) { struct rdcost_block_args* args = arg; + MACROBLOCKD *const xd = &args->x->e_mbd; int x_idx, y_idx; - MACROBLOCKD * const xd = &args->x->e_mbd; - - txfrm_block_to_raster_xy(xd, bsize, plane, block, args->tx_size * 2, &x_idx, - &y_idx); + txfrm_block_to_raster_xy(xd, bsize, plane, block, args->tx_size, + &x_idx, &y_idx); args->rate += cost_coeffs(args->x, plane, block, xd->plane[plane].plane_type, args->t_above + x_idx, |