diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-05-09 12:18:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-09 12:18:10 -0700 |
| commit | eab6a421ea6c873342a8d8d5054180705fa1e097 (patch) | |
| tree | e919fbad5bce48fb4a219cca9b0c01b6b13d843d /vp9/encoder | |
| parent | 8525c02e16988e9eb144f32090bc56042c702d7a (diff) | |
| parent | 1fec23bef648063f3ecf818665b722635cff6536 (diff) | |
| download | libvpx-eab6a421ea6c873342a8d8d5054180705fa1e097.tar libvpx-eab6a421ea6c873342a8d8d5054180705fa1e097.tar.gz libvpx-eab6a421ea6c873342a8d8d5054180705fa1e097.tar.bz2 libvpx-eab6a421ea6c873342a8d8d5054180705fa1e097.zip | |
Merge "Use common get_uv_tx_size()" into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 421052753..4665fccd0 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -378,7 +378,8 @@ void vp9_optimize_init(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize, const struct macroblockd_plane* const plane = &xd->plane[p]; const int bwl = b_width_log2(bsize) - plane->subsampling_x; const int bhl = b_height_log2(bsize) - plane->subsampling_y; - const TX_SIZE tx_size = tx_size_for_plane(xd, bsize, p); + const TX_SIZE tx_size = p ? get_uv_tx_size(xd) + : xd->mode_info_context->mbmi.txfm_size; int i, j; for (i = 0; i < 1 << bwl; i += 1 << tx_size) { |