From 551d0fed2e4042f986eb2a78beb9c9d75cfc54e9 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Mon, 22 May 2017 12:48:05 -0700 Subject: [PATCH] Revert "dependent tile set to default" This reverts commit 05c38874184beaeff4b17fef6e3c2738b84aea07. BUG=aomedia:553 Change-Id: Ibbfe3e357bbfb8cb7d07482755c47c64afd30092 --- av1/encoder/encodeframe.c | 9 +++++++++ configure | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index 5155344ea..c59407bbf 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c @@ -354,7 +354,11 @@ static void set_offsets_supertx(const AV1_COMP *const cpi, ThreadData *td, MACROBLOCKD *const xd = &x->e_mbd; const int mi_width = mi_size_wide[bsize]; const int mi_height = mi_size_high[bsize]; +#if CONFIG_DEPENDENT_HORZTILES + set_mode_info_offsets(cpi, x, xd, mi_row, mi_col, cm->dependent_horz_tiles); +#else set_mode_info_offsets(cpi, x, xd, mi_row, mi_col); +#endif // Set up distance of MB to edge of frame in 1/8th pel units. assert(!(mi_col & (mi_width - 1)) && !(mi_row & (mi_height - 1))); @@ -378,7 +382,12 @@ static void set_offsets_extend(const AV1_COMP *const cpi, ThreadData *td, const int mi_width = mi_size_wide[bsize_pred]; const int mi_height = mi_size_high[bsize_pred]; +#if CONFIG_DEPENDENT_HORZTILES + set_mode_info_offsets(cpi, x, xd, mi_row_ori, mi_col_ori, + cm->dependent_horz_tiles); +#else set_mode_info_offsets(cpi, x, xd, mi_row_ori, mi_col_ori); +#endif // Set up limit values for MV components. // Mv beyond the range do not produce new/different prediction block. diff --git a/configure b/configure index 42199e453..a112a4c4c 100755 --- a/configure +++ b/configure @@ -501,7 +501,6 @@ post_process_cmdline() { soft_enable palette soft_enable alt_intra soft_enable palette_throughput - soft_enable dependent_horztiles soft_enable tempmv_signaling # Workaround features currently incompatible with highbitdepth -- GitLab