diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-06-16 05:37:54 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-06-16 05:37:54 -0700 |
| commit | b2658ec3218950d1089b0147c2489ee286a0571c (patch) | |
| tree | 69c2ff4b7a312f85409348dc3d809372fbe39eb9 /vp9/encoder/vp9_bitstream.c | |
| parent | e67d45d4ce92468ba193288b59093fef0a502662 (diff) | |
| download | libvpx-b2658ec3218950d1089b0147c2489ee286a0571c.tar.gz libvpx-b2658ec3218950d1089b0147c2489ee286a0571c.tar.bz2 libvpx-b2658ec3218950d1089b0147c2489ee286a0571c.zip | |
Eliminated frame_type check in get_partition_probs()
Moved the frame_type check to the tile level and stored
the prob ptr in MACROBLOCKD.
Change-Id: I10b5a4abd58213dc7610e3ade1a1583c01526842
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index d20e06766..9b493d7d2 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -403,7 +403,7 @@ static void write_partition(const VP9_COMMON *const cm, int hbs, int mi_row, int mi_col, PARTITION_TYPE p, BLOCK_SIZE bsize, vp9_writer *w) { const int ctx = partition_plane_context(xd, mi_row, mi_col, bsize); - const vp9_prob *const probs = get_partition_probs(cm, ctx); + const vp9_prob *const probs = xd->partition_probs[ctx]; const int has_rows = (mi_row + hbs) < cm->mi_rows; const int has_cols = (mi_col + hbs) < cm->mi_cols; @@ -481,9 +481,12 @@ static void write_modes_sb(VP9_COMP *cpi, static void write_modes(VP9_COMP *cpi, const TileInfo *const tile, vp9_writer *w, TOKENEXTRA **tok, const TOKENEXTRA *const tok_end) { + const VP9_COMMON *const cm = &cpi->common; MACROBLOCKD *const xd = &cpi->td.mb.e_mbd; int mi_row, mi_col; + set_partition_probs(cm, xd); + for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end; mi_row += MI_BLOCK_SIZE) { vp9_zero(xd->left_seg_context); |