diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-21 12:12:55 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-03-21 12:12:55 -0700 |
| commit | 4cb37bff965b150baf1d3e2eb3b6ffd398563c88 (patch) | |
| tree | 4d22b09836baf0404311f026458b69a90129485a /vp9/decoder/vp9_decodeframe.c | |
| parent | a57de9da0374231dc08a97533baabaca9f28ec00 (diff) | |
| download | libvpx-4cb37bff965b150baf1d3e2eb3b6ffd398563c88.tar libvpx-4cb37bff965b150baf1d3e2eb3b6ffd398563c88.tar.gz libvpx-4cb37bff965b150baf1d3e2eb3b6ffd398563c88.tar.bz2 libvpx-4cb37bff965b150baf1d3e2eb3b6ffd398563c88.zip | |
Removing redundant {above, left}_seg_context manipulation code.
Change-Id: Ib3c1746e61220c629cbd971b2458aa686b5c9e36
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 30fa94cf6..5e1ed5c10 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -407,9 +407,7 @@ static void decode_block(VP9_COMMON *const cm, MACROBLOCKD *const xd, static PARTITION_TYPE read_partition(VP9_COMMON *cm, MACROBLOCKD *xd, int hbs, int mi_row, int mi_col, BLOCK_SIZE bsize, vp9_reader *r) { - const int ctx = partition_plane_context(xd->above_seg_context, - xd->left_seg_context, - mi_row, mi_col, bsize); + const int ctx = partition_plane_context(xd, mi_row, mi_col, bsize); const vp9_prob *const probs = get_partition_probs(cm, ctx); const int has_rows = (mi_row + hbs) < cm->mi_rows; const int has_cols = (mi_col + hbs) < cm->mi_cols; @@ -474,8 +472,7 @@ static void decode_partition(VP9_COMMON *const cm, MACROBLOCKD *const xd, // update partition context if (bsize >= BLOCK_8X8 && (bsize == BLOCK_8X8 || partition != PARTITION_SPLIT)) - update_partition_context(xd->above_seg_context, xd->left_seg_context, - mi_row, mi_col, subsize, bsize); + update_partition_context(xd, mi_row, mi_col, subsize, bsize); } static void setup_token_decoder(const uint8_t *data, |