Remove CONFIG_OBU_REDUNDANT_FRAME_HEADER
This tool is fully adopted.
Change-Id: Ifd8304627085fe316f6344be9949ab349a2f99db
diff --git a/aom/src/aom_codec.c b/aom/src/aom_codec.c
index 923b852..dbd6fa5 100644
--- a/aom/src/aom_codec.c
+++ b/aom/src/aom_codec.c
@@ -144,9 +144,7 @@
case OBU_SEQUENCE_HEADER: return "OBU_SEQUENCE_HEADER";
case OBU_TEMPORAL_DELIMITER: return "OBU_TEMPORAL_DELIMITER";
case OBU_FRAME_HEADER: return "OBU_FRAME_HEADER";
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_REDUNDANT_FRAME_HEADER: return "OBU_REDUNDANT_FRAME_HEADER";
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_FRAME: return "OBU_FRAME";
case OBU_TILE_GROUP: return "OBU_TILE_GROUP";
case OBU_METADATA: return "OBU_METADATA";
diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 22c1a9f..79e1c13 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -47,9 +47,7 @@
case OBU_SEQUENCE_HEADER:
case OBU_TEMPORAL_DELIMITER:
case OBU_FRAME_HEADER:
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_REDUNDANT_FRAME_HEADER:
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_FRAME:
case OBU_TILE_GROUP:
case OBU_METADATA:
@@ -66,9 +64,7 @@
case OBU_SEQUENCE_HEADER:
case OBU_TEMPORAL_DELIMITER:
case OBU_FRAME_HEADER:
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_REDUNDANT_FRAME_HEADER:
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_FRAME:
case OBU_TILE_GROUP:
case OBU_METADATA:
@@ -462,9 +458,7 @@
}
break;
case OBU_FRAME_HEADER:
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_REDUNDANT_FRAME_HEADER:
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_FRAME:
#if CONFIG_OPERATING_POINTS
// don't decode obu if it's not in current operating mode
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 0f4e3c2..fce4c96 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3753,12 +3753,10 @@
// Insert a copy of the Frame Header OBU.
memcpy(data, fh_info->frame_header, fh_info->total_length);
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
// Rewrite the OBU header to change the OBU type to Redundant Frame
// Header.
write_obu_header(OBU_REDUNDANT_FRAME_HEADER, obu_extension_header,
&data[fh_info->obu_header_byte_offset]);
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
data += fh_info->total_length;
@@ -3861,10 +3859,7 @@
return AOM_CODEC_ERROR;
}
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
fh_info.obu_header_byte_offset = 0;
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
-
fh_info.total_length =
obu_header_size + obu_payload_size + length_field_size;
data += fh_info.total_length;
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 5d0ed64..d6583c4 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -97,7 +97,6 @@
set(CONFIG_FRAME_COUNTER_FOR_SCALABILITY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_INTER_STATS_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOWPRECISION_BLEND 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_OBU_REDUNDANT_FRAME_HEADER 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OPERATING_POINTS 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_RD_DEBUG 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TRAILING_BITS 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/tools/obu_parser.cc b/tools/obu_parser.cc
index cbfc76d..fff51d5 100644
--- a/tools/obu_parser.cc
+++ b/tools/obu_parser.cc
@@ -66,9 +66,7 @@
case OBU_TEMPORAL_DELIMITER:
case OBU_FRAME_HEADER:
case OBU_TILE_GROUP:
-#if CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_REDUNDANT_FRAME_HEADER:
-#endif // CONFIG_OBU_REDUNDANT_FRAME_HEADER
case OBU_FRAME:
case OBU_METADATA:
case OBU_PADDING: return true;
