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}diff --git a/common_video/generic_frame_descriptor/generic_frame_info.cc b/common_video/generic_frame_descriptor/generic_frame_info.cc
index 4294e95..94a6192 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::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 b800adc..91a0868 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 @@
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 @@
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 70e78a7..d47317e 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 @@
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 594afad..9412ba4 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -379,7 +379,7 @@
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) {
