diff options
| author | Alex Converse <aconverse@google.com> | 2014-03-11 16:39:42 -0700 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-03-11 16:39:42 -0700 |
| commit | 59853f8fdfb78a7114bb627256c99c25afb47846 (patch) | |
| tree | 152866321362561b06daa42d19550e065db03b68 /vp9 | |
| parent | 75272c97cbc9edc7ada65df9bf17159038bb71ae (diff) | |
| download | libvpx-59853f8fdfb78a7114bb627256c99c25afb47846.tar libvpx-59853f8fdfb78a7114bb627256c99c25afb47846.tar.gz libvpx-59853f8fdfb78a7114bb627256c99c25afb47846.tar.bz2 libvpx-59853f8fdfb78a7114bb627256c99c25afb47846.zip | |
Fix some active_map corner cases.
These were discovered by ActiveMapTest.
Change-Id: Ifcd305ae2d954b6ec7edcaed0f80baf18c769e01
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 9cc43f9e3..cdaed5322 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1769,6 +1769,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, } } + if (!x->in_active_map && (partition_horz_allowed || partition_vert_allowed)) + do_split = 0; // PARTITION_NONE if (partition_none_allowed) { rd_pick_sb_modes(cpi, tile, mi_row, mi_col, &this_rate, &this_dist, bsize, diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index e957b1553..5fc867287 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3171,7 +3171,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, const int mode_search_skip_flags = cpi->sf.mode_search_skip_flags; const int intra_y_mode_mask = cpi->sf.intra_y_mode_mask[max_txsize_lookup[bsize]]; - const int disable_inter_mode_mask = cpi->sf.disable_inter_mode_mask[bsize]; + int disable_inter_mode_mask = cpi->sf.disable_inter_mode_mask[bsize]; x->skip_encode = cpi->sf.skip_encode_frame && x->q_index < QIDX_SKIP_THRESH; @@ -3285,6 +3285,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, mode_index = THR_ZEROMV; mode_skip_mask = ~(1 << mode_index); mode_skip_start = MAX_MODES; + disable_inter_mode_mask = 0; } for (mode_index = 0; mode_index < MAX_MODES; ++mode_index) { |