diff options
author | Hui Su <huisu@google.com> | 2018-10-12 19:59:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 19:59:53 +0000 |
commit | f4300285a39a336508e5692d0532e41d4efb5e73 (patch) | |
tree | 8798cb457932c7b61907c0b2b5b1fa474f56c8eb | |
parent | 1db646f0de18bc4b43fb901025a9e3cedb6a8157 (diff) | |
parent | bb82c4997fc8313deaedaea37bdd32be9f271d88 (diff) | |
download | libvpx-f4300285a39a336508e5692d0532e41d4efb5e73.tar libvpx-f4300285a39a336508e5692d0532e41d4efb5e73.tar.gz libvpx-f4300285a39a336508e5692d0532e41d4efb5e73.tar.bz2 libvpx-f4300285a39a336508e5692d0532e41d4efb5e73.zip |
Merge "Enable ML based rect partition pruning for HBD"
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 314fb21f5..3edf08128 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -4018,13 +4018,9 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td, } { - int do_ml_rect_partition_pruning = + const int do_ml_rect_partition_pruning = !frame_is_intra_only(cm) && !force_horz_split && !force_vert_split && (partition_horz_allowed || partition_vert_allowed) && bsize > BLOCK_8X8; -#if CONFIG_VP9_HIGHBITDEPTH - if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) - do_ml_rect_partition_pruning = 0; -#endif if (do_ml_rect_partition_pruning) { ml_prune_rect_partition(cpi, x, bsize, pc_tree, &partition_horz_allowed, &partition_vert_allowed, best_rdc.rdcost, mi_row, |