zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename OperatingPoint to DecodeTarget.

Browse Source 
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}
This commit is contained in:
philipel
2019-03-28 14:12:10 +01:00
committed by Commit Bot
parent 13339483a4
commit 361855bac8
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common_video/generic_frame_descriptor/generic_frame_info.cc
View File

@ -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;

6
common_video/generic_frame_descriptor/generic_frame_info.h
View File

@ -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

2
modules/video_coding/codecs/vp8/default_temporal_layers.cc
View File

@ -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) {

2
modules/video_coding/codecs/vp8/screenshare_layers.cc
View File

@ -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) {