diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-28 11:12:22 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-28 11:12:22 -0800 |
| commit | e4159100bc3b7fb796700d9629a860c05bda4da3 (patch) | |
| tree | 7d8787a93efeb209563b778a8624c3fddac473b2 /vp9/decoder/vp9_decodeframe.c | |
| parent | d5e6f09585d07381068ae533dfad6a8a91febfd8 (diff) | |
| parent | 1ae91f77840c760b2bc5ab25a4b84b3a9e9f8127 (diff) | |
| download | libvpx-e4159100bc3b7fb796700d9629a860c05bda4da3.tar libvpx-e4159100bc3b7fb796700d9629a860c05bda4da3.tar.gz libvpx-e4159100bc3b7fb796700d9629a860c05bda4da3.tar.bz2 libvpx-e4159100bc3b7fb796700d9629a860c05bda4da3.zip | |
Merge "Adding get_y_mode() function."
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index e52b3f759..56b993d5f 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -287,10 +287,8 @@ static void predict_and_reconstruct_intra_block(int plane, int block, MACROBLOCKD *const xd = args->xd; struct macroblockd_plane *const pd = &xd->plane[plane]; MODE_INFO *const mi = xd->mi_8x8[0]; - const MB_PREDICTION_MODE mode = (plane == 0) - ? ((mi->mbmi.sb_type < BLOCK_8X8) ? mi->bmi[block].as_mode - : mi->mbmi.mode) - : mi->mbmi.uv_mode; + const MB_PREDICTION_MODE mode = (plane == 0) ? get_y_mode(mi, block) + : mi->mbmi.uv_mode; int x, y; uint8_t *dst; txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &x, &y); |