From 361855bac8edc2438b613c3ea28ab307a538df77 Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Thu, 28 Mar 2019 14:12:10 +0100
Subject: [PATCH] Rename OperatingPoint to DecodeTarget.

Bug: webrtc:10342
Change-Id: Ie82e23b2ccb921f3b6d86c3f8f2152264a9c26d5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130160
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27342}
---
 .../generic_frame_descriptor/generic_frame_info.cc   | 12 ++++++------
 .../generic_frame_descriptor/generic_frame_info.h    |  6 +++---
 .../codecs/vp8/default_temporal_layers.cc            |  2 +-
 .../video_coding/codecs/vp8/screenshare_layers.cc    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common_video/generic_frame_descriptor/generic_frame_info.cc b/common_video/generic_frame_descriptor/generic_frame_info.cc
index 4294e9521a..94a6192835 100644
--- a/common_video/generic_frame_descriptor/generic_frame_info.cc
+++ b/common_video/generic_frame_descriptor/generic_frame_info.cc
@@ -39,16 +39,16 @@ GenericFrameInfo::Builder& GenericFrameInfo::Builder::S(int spatial_id) {
 GenericFrameInfo::Builder& GenericFrameInfo::Builder::Dtis(
     absl::string_view indication_symbols) {
   for (const auto& symbol : indication_symbols) {
-    OperatingPointIndication indication;
+    DecodeTargetIndication indication;
     switch (symbol) {
-      case '-': indication = OperatingPointIndication::kNotPresent; break;
-      case 'D': indication = OperatingPointIndication::kDiscardable; break;
-      case 'R': indication = OperatingPointIndication::kRequired; break;
-      case 'S': indication = OperatingPointIndication::kSwitch; break;
+      case '-': indication = DecodeTargetIndication::kNotPresent; break;
+      case 'D': indication = DecodeTargetIndication::kDiscardable; break;
+      case 'R': indication = DecodeTargetIndication::kRequired; break;
+      case 'S': indication = DecodeTargetIndication::kSwitch; break;
       default: RTC_NOTREACHED();
     }
 
-    info_.operating_points.push_back(indication);
+    info_.decode_target_indications.push_back(indication);
   }
 
   return *this;
diff --git a/common_video/generic_frame_descriptor/generic_frame_info.h b/common_video/generic_frame_descriptor/generic_frame_info.h
index b800adc9de..91a0868b15 100644
--- a/common_video/generic_frame_descriptor/generic_frame_info.h
+++ b/common_video/generic_frame_descriptor/generic_frame_info.h
@@ -21,7 +21,7 @@
 namespace webrtc {
 
 struct GenericFrameInfo {
-  enum class OperatingPointIndication {
+  enum class DecodeTargetIndication {
     kNotPresent,   // GenericFrameInfo::Builder symbol '-'
     kDiscardable,  // GenericFrameInfo::Builder symbol 'D'
     kSwitch,       // GenericFrameInfo::Builder symbol 'S'
@@ -37,7 +37,7 @@ struct GenericFrameInfo {
   int temporal_id = 0;
   int spatial_id = 0;
   absl::InlinedVector<int, 10> frame_diffs;
-  absl::InlinedVector<OperatingPointIndication, 10> operating_points;
+  absl::InlinedVector<DecodeTargetIndication, 10> decode_target_indications;
 };
 
 class GenericFrameInfo::Builder {
@@ -62,7 +62,7 @@ struct TemplateStructure {
   TemplateStructure& operator=(const TemplateStructure&);
   ~TemplateStructure();
 
-  int num_operating_points = 0;
+  int num_decode_targets = 0;
   std::vector<GenericFrameInfo> templates;
 };
 }  // namespace webrtc
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
index 70e78a7062..d47317e5a4 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
@@ -551,7 +551,7 @@ TemplateStructure DefaultTemporalLayers::GetTemplateStructure(
   RTC_CHECK_GT(num_layers, 0);
 
   TemplateStructure template_structure;
-  template_structure.num_operating_points = num_layers;
+  template_structure.num_decode_targets = num_layers;
 
   using Builder = GenericFrameInfo::Builder;
   switch (num_layers) {
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
index 594afad605..9412ba43d5 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -379,7 +379,7 @@ TemplateStructure ScreenshareLayers::GetTemplateStructure(
   RTC_CHECK_GT(num_layers, 0);
 
   TemplateStructure template_structure;
-  template_structure.num_operating_points = num_layers;
+  template_structure.num_decode_targets = num_layers;
 
   using Builder = GenericFrameInfo::Builder;
   switch (num_layers) {