Commit 2e868abe authored by Thomas Davies's avatar Thomas Davies Committed by Yaowu Xu

Remove redundant experiment.

restrict_compressed_hdr experiment is made redundant by
new_multisymbol.

BUG=aomedia:870

Change-Id: I86100d114ca641a453c32ffd09cabb736809abd1
parent fb838778
...@@ -1371,13 +1371,11 @@ static INLINE int all_lossless(const AV1_COMMON *cm, const MACROBLOCKD *xd) { ...@@ -1371,13 +1371,11 @@ static INLINE int all_lossless(const AV1_COMMON *cm, const MACROBLOCKD *xd) {
static INLINE int use_compressed_header(const AV1_COMMON *cm) { static INLINE int use_compressed_header(const AV1_COMMON *cm) {
(void)cm; (void)cm;
#if CONFIG_RESTRICT_COMPRESSED_HDR && CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
return 0; return 0;
#elif CONFIG_RESTRICT_COMPRESSED_HDR
return cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_FORWARD;
#else #else
return 1; return 1;
#endif // CONFIG_RESTRICT_COMPRESSED_HDR && CONFIG_NEW_MULTISYMBOL #endif // CONFIG_NEW_MULTISYMBOL
} }
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -148,7 +148,7 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) { ...@@ -148,7 +148,7 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
#endif // CONFIG_VAR_TX_NO_TX_MODE #endif // CONFIG_VAR_TX_NO_TX_MODE
} }
#if !CONFIG_RESTRICT_COMPRESSED_HDR #if !CONFIG_NEW_MULTISYMBOL
static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) { static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i; int i;
for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i) for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i)
...@@ -177,7 +177,7 @@ static REFERENCE_MODE read_frame_reference_mode( ...@@ -177,7 +177,7 @@ static REFERENCE_MODE read_frame_reference_mode(
} }
} }
#if !CONFIG_RESTRICT_COMPRESSED_HDR #if !CONFIG_NEW_MULTISYMBOL
static void read_frame_reference_mode_probs(AV1_COMMON *cm, aom_reader *r) { static void read_frame_reference_mode_probs(AV1_COMMON *cm, aom_reader *r) {
FRAME_CONTEXT *const fc = cm->fc; FRAME_CONTEXT *const fc = cm->fc;
int i; int i;
...@@ -3489,7 +3489,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi, ...@@ -3489,7 +3489,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
size_t partition_size) { size_t partition_size) {
#if CONFIG_RESTRICT_COMPRESSED_HDR #if CONFIG_NEW_MULTISYMBOL
(void)pbi; (void)pbi;
(void)data; (void)data;
(void)partition_size; (void)partition_size;
...@@ -3585,7 +3585,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, ...@@ -3585,7 +3585,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
} }
return aom_reader_has_error(&r); return aom_reader_has_error(&r);
#endif // CONFIG_RESTRICT_COMPRESSED_HDR #endif // CONFIG_NEW_MULTISYMBOL
} }
#ifdef NDEBUG #ifdef NDEBUG
......
...@@ -190,7 +190,6 @@ set(CONFIG_RECT_TX 1 CACHE NUMBER "AV1 experiment flag.") ...@@ -190,7 +190,6 @@ set(CONFIG_RECT_TX 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_RECT_TX_EXT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RESTRICT_COMPRESSED_HDR 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SEGMENT_ZEROMV 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SEGMENT_ZEROMV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_SMOOTH_HV 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_SMOOTH_HV 1 CACHE NUMBER "AV1 experiment flag.")
......
...@@ -345,7 +345,6 @@ EXPERIMENT_LIST=" ...@@ -345,7 +345,6 @@ EXPERIMENT_LIST="
opt_ref_mv opt_ref_mv
tmv tmv
ext_warped_motion ext_warped_motion
restrict_compressed_hdr
horzonly_frame_superres horzonly_frame_superres
simple_bwd_adapt simple_bwd_adapt
" "
...@@ -562,7 +561,6 @@ post_process_cmdline() { ...@@ -562,7 +561,6 @@ post_process_cmdline() {
enabled lgt_from_pred && disable_feature mrc_tx enabled lgt_from_pred && disable_feature mrc_tx
enabled cfl && enable_feature smooth_hv enabled cfl && enable_feature smooth_hv
enabled cdef_singlepass && enable_feature cdef enabled cdef_singlepass && enable_feature cdef
enabled new_multisymbol && enable_feature restrict_compressed_hdr
enabled mfmv && enable_feature frame_marker enabled mfmv && enable_feature frame_marker
enabled jnt_comp && enable_feature frame_marker enabled jnt_comp && enable_feature frame_marker
enabled frame_sign_bias && enable_feature frame_marker enabled frame_sign_bias && enable_feature frame_marker
......
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