From 1ae91f77840c760b2bc5ab25a4b84b3a9e9f8127 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Thu, 27 Feb 2014 16:05:50 -0800 Subject: Adding get_y_mode() function. Change-Id: Iaac57b24f79cd205a8c62bc1177412d22f5787a8 --- vp9/decoder/vp9_decodeframe.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vp9/decoder/vp9_decodeframe.c') diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 80340b51a..963020f08 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -290,10 +290,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); -- cgit v1.2.3