Remove CONFIG_OPERATING_POINTS

This tool is fully adopted.

Change-Id: I2f514dfba03daa30e4e591cc9448fc620d29feaf

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 03fe6b7..c712b52 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -63,12 +63,10 @@
 
 #define NUM_PING_PONG_BUFFERS 2
 
-#if CONFIG_OPERATING_POINTS
 #define MAX_NUM_TEMPORAL_LAYERS 8
 #define MAX_NUM_SPATIAL_LAYERS 4
 #define MAX_NUM_OPERATING_POINTS \
   MAX_NUM_TEMPORAL_LAYERS + MAX_NUM_SPATIAL_LAYERS
-#endif
 
 // TODO(jingning): Turning this on to set up transform coefficient
 // processing timer.
@@ -223,14 +221,12 @@
                            //     enabled for that frame.
   int enable_cdef;         // To turn on/off CDEF
   int enable_restoration;  // To turn on/off loop restoration
-#if CONFIG_OPERATING_POINTS
   int operating_point_idc[MAX_NUM_OPERATING_POINTS];
   int level[MAX_NUM_OPERATING_POINTS];
   int decoder_rate_model_param_present_flag[MAX_NUM_OPERATING_POINTS];
   int decode_to_display_rate_ratio[MAX_NUM_OPERATING_POINTS];
   int initial_display_delay[MAX_NUM_OPERATING_POINTS];
   int extra_frame_buffers[MAX_NUM_OPERATING_POINTS];
-#endif  // CONFIG_OPERATING_POINTS
 } SequenceHeader;
 
 typedef struct AV1Common {

av1/decoder/decoder.h

diff --git a/av1/decoder/decoder.h b/av1/decoder/decoder.h
index e9fa260..650dfee 100644
--- a/av1/decoder/decoder.h
+++ b/av1/decoder/decoder.h
@@ -97,9 +97,7 @@
   aom_inspect_cb inspect_cb;
   void *inspect_ctx;
 #endif
-#if CONFIG_OPERATING_POINTS
   int current_operating_point;
-#endif
 } AV1Decoder;
 
 int av1_receive_compressed_data(struct AV1Decoder *pbi, size_t size,

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 35db989..4a3828b 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -121,7 +121,6 @@
   return parse_result;
 }
 
-#if CONFIG_OPERATING_POINTS
 static int is_obu_in_current_operating_point(AV1Decoder *pbi,
                                              ObuHeader obu_header) {
   if (!pbi->current_operating_point) {
@@ -135,7 +134,6 @@
   }
   return 0;
 }
-#endif
 
 static uint32_t read_temporal_delimiter_obu() { return 0; }
 
@@ -146,13 +144,6 @@
 
   cm->profile = av1_read_profile(rb);
 
-#if !CONFIG_OPERATING_POINTS
-  int i;
-  pbi->common.enhancement_layers_cnt = aom_rb_read_literal(rb, 2);
-  for (i = 0; i <= pbi->common.enhancement_layers_cnt; i++) {
-    aom_rb_read_literal(rb, 4);  // level for each enhancement layer
-  }
-#else   // CONFIG_OPERATING_POINTS
   uint8_t operating_points_minus1_cnt = aom_rb_read_literal(rb, 5);
   pbi->common.enhancement_layers_cnt = operating_points_minus1_cnt + 1;
   int i;
@@ -170,7 +161,6 @@
   }
   // This decoder supports all levels.  Choose the first operating point
   pbi->current_operating_point = seq_params->operating_point_idc[0];
-#endif  // CONFIG_OPERATING_POINTS
 
   read_sequence_header(cm, rb);
 
@@ -443,13 +433,11 @@
       case OBU_FRAME_HEADER:
       case OBU_REDUNDANT_FRAME_HEADER:
       case OBU_FRAME:
-#if CONFIG_OPERATING_POINTS
         // don't decode obu if it's not in current operating mode
         if (!is_obu_in_current_operating_point(pbi, obu_header)) {
           decoded_payload_size = payload_size;
           break;
         }
-#endif
         // Only decode first frame header received
         if (!frame_header_received) {
 #if CONFIG_TRAILING_BITS
@@ -487,26 +475,22 @@
           cm->error.error_code = AOM_CODEC_CORRUPT_FRAME;
           return;
         }
-#if CONFIG_OPERATING_POINTS
         // don't decode obu if it's not in current operating mode
         if (!is_obu_in_current_operating_point(pbi, obu_header)) {
           decoded_payload_size = payload_size;
           break;
         }
-#endif
         decoded_payload_size += read_one_tile_group_obu(
             pbi, &rb, is_first_tg_obu_received, data + obu_payload_offset,
             data + payload_size, p_data_end, &frame_decoding_finished);
         is_first_tg_obu_received = 0;
         break;
       case OBU_METADATA:
-#if CONFIG_OPERATING_POINTS
         // don't decode obu if it's not in current operating mode
         if (!is_obu_in_current_operating_point(pbi, obu_header)) {
           decoded_payload_size = payload_size;
           break;
         }
-#endif
         decoded_payload_size = read_metadata(data, payload_size);
         break;
       case OBU_PADDING:

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 8fdc4c3..06c9d4a 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3353,13 +3353,6 @@
 
   write_profile(cm->profile, &wb);
 
-#if !CONFIG_OPERATING_POINTS
-  aom_wb_write_literal(&wb, enhancement_layers_cnt, 2);
-  int i;
-  for (i = 0; i <= enhancement_layers_cnt; i++) {
-    aom_wb_write_literal(&wb, 0, 4);
-  }
-#else   // CONFIG_OPERATING_POINTS
   uint8_t operating_points_minus1_cnt = enhancement_layers_cnt;
   aom_wb_write_literal(&wb, operating_points_minus1_cnt, 5);
   int i;
@@ -3368,7 +3361,6 @@
     aom_wb_write_literal(&wb, 0, 4);   // level[i]
     aom_wb_write_literal(&wb, 0, 1);   // decoder_rate_model_present_flag[i]
   }
-#endif  // CONFIG_OPERATING_POINTS
 
   write_sequence_header(cpi, &wb);
 

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 15faa58..7abd65b 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -93,7 +93,6 @@
 set(CONFIG_EXPLICIT_ORDER_HINT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FP_MB_STATS 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTER_STATS_ONLY 0 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.")
 set(CONFIG_FILEOPTIONS 1 CACHE NUMBER "AV1 config option flag.")