Remove redundant config flags from get_entropy_context The rectangular transform syntax is by default supported, hence no need to put it under the experimental flag. This does not change the coding statistics. Change-Id: I3a147503d973a03400f8a86e11f07c7d754e6234
diff --git a/av1/common/entropy.c b/av1/common/entropy.c index 7e66e93..80eaccc 100644 --- a/av1/common/entropy.c +++ b/av1/common/entropy.c
@@ -64,11 +64,9 @@ #endif { 1, 2, 3, 4, 3, 16 - 13, 0 }, { 1, 2, 3, 4, 11, 64 - 21, 0 }, { 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 }, -#if CONFIG_EXT_TX { 1, 2, 3, 4, 8, 32 - 18, 0 }, { 1, 2, 3, 4, 8, 32 - 18, 0 }, { 1, 2, 3, 4, 11, 128 - 21, 0 }, { 1, 2, 3, 4, 11, 128 - 21, 0 }, { 1, 2, 3, 4, 11, 512 - 21, 0 }, { 1, 2, 3, 4, 11, 512 - 21, 0 }, -#endif // CONFIG_EXT_TX }; const uint16_t band_cum_count_table[TX_SIZES_ALL][8] = { @@ -77,11 +75,9 @@ #endif { 0, 1, 3, 6, 10, 13, 16, 0 }, { 0, 1, 3, 6, 10, 21, 64, 0 }, { 0, 1, 3, 6, 10, 21, 256, 0 }, { 0, 1, 3, 6, 10, 21, 1024, 0 }, -#if CONFIG_EXT_TX { 0, 1, 3, 6, 10, 18, 32, 0 }, { 0, 1, 3, 6, 10, 18, 32, 0 }, { 0, 1, 3, 6, 10, 21, 128, 0 }, { 0, 1, 3, 6, 10, 21, 128, 0 }, { 0, 1, 3, 6, 10, 21, 512, 0 }, { 0, 1, 3, 6, 10, 21, 512, 0 }, -#endif // CONFIG_EXT_TX }; const uint8_t av1_coefband_trans_8x8plus[1024] = {
diff --git a/av1/common/entropy.h b/av1/common/entropy.h index 423b35c..55ed8d4 100644 --- a/av1/common/entropy.h +++ b/av1/common/entropy.h
@@ -222,7 +222,6 @@ above_ec = a[0] != 0; left_ec = l[0] != 0; break; -#if CONFIG_EXT_TX case TX_4X8: above_ec = a[0] != 0; left_ec = !!*(const uint16_t *)l; @@ -247,7 +246,6 @@ above_ec = !!*(const uint64_t *)a; left_ec = !!*(const uint32_t *)l; break; -#endif // CONFIG_EXT_TX case TX_8X8: above_ec = !!*(const uint16_t *)a; left_ec = !!*(const uint16_t *)l;
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c index f5af485..fe6c720 100644 --- a/av1/encoder/rd.c +++ b/av1/encoder/rd.c
@@ -571,7 +571,6 @@ for (i = 0; i < num_4x4_h; i += 8) t_left[i] = !!*(const uint64_t *)&left[i]; break; -#if CONFIG_EXT_TX && CONFIG_RECT_TX case TX_4X8: memcpy(t_above, above, sizeof(ENTROPY_CONTEXT) * num_4x4_w); for (i = 0; i < num_4x4_h; i += 2) @@ -606,7 +605,6 @@ for (i = 0; i < num_4x4_h; i += 4) t_left[i] = !!*(const uint32_t *)&left[i]; break; -#endif // CONFIG_EXT_TX && CONFIG_RECT_TX default: assert(0 && "Invalid transform size."); break; } }