From 6eaca27df21d2bd8da1c063c484b5f5c28621d3a Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Mon, 9 Mar 2015 16:25:01 -0700 Subject: [PATCH] Refactor read_intra_frame_mode_info Change-Id: I56b0614154408e8ec613784b2007374df00fbf17 --- vp9/decoder/vp9_decodemv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 37bdfe058..072f6b7b7 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -122,11 +122,10 @@ static void copy_segment_id(const VP9_COMMON *cm, last_segment_ids[mi_offset + y * cm->mi_cols + x] : 0; } -static int read_intra_segment_id(VP9_COMMON *const cm, MACROBLOCKD *const xd, +static int read_intra_segment_id(VP9_COMMON *const cm, BLOCK_SIZE bsize, int mi_row, int mi_col, vp9_reader *r) { struct segmentation *const seg = &cm->seg; - const BLOCK_SIZE bsize = xd->mi[0].src_mi->mbmi.sb_type; int segment_id; if (!seg->enabled) @@ -199,7 +198,7 @@ static void read_intra_frame_mode_info(VP9_COMMON *const cm, const BLOCK_SIZE bsize = mbmi->sb_type; int i; - mbmi->segment_id = read_intra_segment_id(cm, xd, mi_row, mi_col, r); + mbmi->segment_id = read_intra_segment_id(cm, bsize, mi_row, mi_col, r); mbmi->skip = read_skip(cm, xd, counts, mbmi->segment_id, r); mbmi->tx_size = read_tx_size(cm, xd, counts, 1, r); mbmi->ref_frame[0] = INTRA_FRAME; -- 2.40.0