OSUOSL/Nero are experiencing Internet connectivity problems. This affects us as we're hosted with OSUOSL. We apologize for the inconvenience.

Commit ea35e65f authored by Yunqing Wang's avatar Yunqing Wang

Disable adapt_scan when large_scale_tile = 1

In EXT_TILE experiment, disabled adapt_scan when large_scale_tile = 1.

Change-Id: If3b20d5fe3a6674aefba3e37b2458137ca7918ff
parent c76ed28e
...@@ -3271,7 +3271,12 @@ static size_t read_uncompressed_header(AV1Decoder *pbi, ...@@ -3271,7 +3271,12 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
cm->reduced_tx_set_used = aom_rb_read_bit(rb); cm->reduced_tx_set_used = aom_rb_read_bit(rb);
#if CONFIG_ADAPT_SCAN #if CONFIG_ADAPT_SCAN
cm->use_adapt_scan = aom_rb_read_bit(rb); #if CONFIG_EXT_TILE
if (cm->large_scale_tile)
cm->use_adapt_scan = 0;
else
#endif // CONFIG_EXT_TILE
cm->use_adapt_scan = aom_rb_read_bit(rb);
// TODO(angiebird): call av1_init_scan_order only when use_adapt_scan // TODO(angiebird): call av1_init_scan_order only when use_adapt_scan
// switches from 1 to 0 // switches from 1 to 0
if (cm->use_adapt_scan == 0) av1_init_scan_order(cm); if (cm->use_adapt_scan == 0) av1_init_scan_order(cm);
......
...@@ -4095,7 +4095,12 @@ static void write_uncompressed_header_frame(AV1_COMP *cpi, ...@@ -4095,7 +4095,12 @@ static void write_uncompressed_header_frame(AV1_COMP *cpi,
aom_wb_write_bit(wb, cm->reduced_tx_set_used); aom_wb_write_bit(wb, cm->reduced_tx_set_used);
#if CONFIG_ADAPT_SCAN #if CONFIG_ADAPT_SCAN
aom_wb_write_bit(wb, cm->use_adapt_scan); #if CONFIG_EXT_TILE
if (cm->large_scale_tile)
assert(cm->use_adapt_scan == 0);
else
#endif // CONFIG_EXT_TILE
aom_wb_write_bit(wb, cm->use_adapt_scan);
#endif #endif
if (!frame_is_intra_only(cm)) write_global_motion(cpi, wb); if (!frame_is_intra_only(cm)) write_global_motion(cpi, wb);
......
...@@ -4268,7 +4268,12 @@ void av1_encode_frame(AV1_COMP *cpi) { ...@@ -4268,7 +4268,12 @@ void av1_encode_frame(AV1_COMP *cpi) {
// rather than the potential full set of 16 transforms // rather than the potential full set of 16 transforms
cm->reduced_tx_set_used = 0; cm->reduced_tx_set_used = 0;
#if CONFIG_ADAPT_SCAN #if CONFIG_ADAPT_SCAN
cm->use_adapt_scan = 1; #if CONFIG_EXT_TILE
if (cm->large_scale_tile)
cm->use_adapt_scan = 0;
else
#endif // CONFIG_EXT_TILE
cm->use_adapt_scan = 1;
// TODO(angiebird): call av1_init_scan_order only when use_adapt_scan // TODO(angiebird): call av1_init_scan_order only when use_adapt_scan
// switches from 1 to 0 // switches from 1 to 0
if (cm->use_adapt_scan == 0) av1_init_scan_order(cm); if (cm->use_adapt_scan == 0) av1_init_scan_order(cm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment