summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorPaul Wilkins <paulwilkins@google.com>2019-03-28 10:49:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-28 10:49:55 +0000
commit6753efd235230c49c42387a08f741b144de0701d (patch)
treee79c56aead4ddf452b865bb75347405e94abd930 /vp9
parente031f49f897c27c94448159d4ce31a1c5810a84a (diff)
parentb09f628df8ba80212c4dc8bab82d23ef97da7b42 (diff)
downloadlibvpx-6753efd235230c49c42387a08f741b144de0701d.tar
libvpx-6753efd235230c49c42387a08f741b144de0701d.tar.gz
libvpx-6753efd235230c49c42387a08f741b144de0701d.tar.bz2
libvpx-6753efd235230c49c42387a08f741b144de0701d.zip
Merge "Allow more Intra choices in film mode."
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_rdopt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 2c54bf5d3..edba324d4 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3459,7 +3459,8 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, TileDataEnc *tile_data,
// Disable intra modes other than DC_PRED for blocks with low variance
// Threshold for intra skipping based on source variance
// TODO(debargha): Specialize the threshold for super block sizes
- const unsigned int skip_intra_var_thresh = 64;
+ const unsigned int skip_intra_var_thresh =
+ (cpi->oxcf.content == VP9E_CONTENT_FILM) ? 0 : 64;
if ((mode_search_skip_flags & FLAG_SKIP_INTRA_LOWVAR) &&
x->source_variance < skip_intra_var_thresh)
continue;