Extend structures to store updated version of the dependency descriptor
Rename structures to match terminology in the spec Bug: webrtc:10342 Change-Id: I1329abaca98ae7f82307451032d5ce1533e80772 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143960 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28402}
This commit is contained in:
committed by
Commit Bot
parent
a3f3ab91dd
commit
c2f56862a6
@ -585,12 +585,12 @@ void DefaultTemporalLayers::OnRttUpdate(int64_t rtt_ms) {}
|
||||
void DefaultTemporalLayers::OnLossNotification(
|
||||
const VideoEncoder::LossNotification& loss_notification) {}
|
||||
|
||||
TemplateStructure DefaultTemporalLayers::GetTemplateStructure(
|
||||
FrameDependencyStructure DefaultTemporalLayers::GetTemplateStructure(
|
||||
int num_layers) const {
|
||||
RTC_CHECK_LT(num_layers, 5);
|
||||
RTC_CHECK_GT(num_layers, 0);
|
||||
|
||||
TemplateStructure template_structure;
|
||||
FrameDependencyStructure template_structure;
|
||||
template_structure.num_decode_targets = num_layers;
|
||||
|
||||
using Builder = GenericFrameInfo::Builder;
|
||||
|
||||
@ -77,8 +77,7 @@ class DefaultTemporalLayers final : public Vp8FrameBufferController {
|
||||
GenericFrameInfo::DecodeTargetInfo(indication_symbols)),
|
||||
frame_config(frame_config) {}
|
||||
|
||||
absl::InlinedVector<GenericFrameInfo::DecodeTargetIndication, 10>
|
||||
decode_target_indications;
|
||||
absl::InlinedVector<DecodeTargetIndication, 10> decode_target_indications;
|
||||
Vp8FrameConfig frame_config;
|
||||
};
|
||||
|
||||
@ -93,7 +92,7 @@ class DefaultTemporalLayers final : public Vp8FrameBufferController {
|
||||
const std::vector<DependencyInfo> temporal_pattern_;
|
||||
// Set of buffers that are never updated except by keyframes.
|
||||
std::set<Vp8FrameConfig::Vp8BufferReference> kf_buffers_;
|
||||
TemplateStructure GetTemplateStructure(int num_layers) const;
|
||||
FrameDependencyStructure GetTemplateStructure(int num_layers) const;
|
||||
|
||||
uint8_t pattern_idx_;
|
||||
// Updated cumulative bitrates, per temporal layer.
|
||||
|
||||
@ -421,12 +421,12 @@ void ScreenshareLayers::OnRttUpdate(int64_t rtt_ms) {}
|
||||
void ScreenshareLayers::OnLossNotification(
|
||||
const VideoEncoder::LossNotification& loss_notification) {}
|
||||
|
||||
TemplateStructure ScreenshareLayers::GetTemplateStructure(
|
||||
FrameDependencyStructure ScreenshareLayers::GetTemplateStructure(
|
||||
int num_layers) const {
|
||||
RTC_CHECK_LT(num_layers, 3);
|
||||
RTC_CHECK_GT(num_layers, 0);
|
||||
|
||||
TemplateStructure template_structure;
|
||||
FrameDependencyStructure template_structure;
|
||||
template_structure.num_decode_targets = num_layers;
|
||||
|
||||
using Builder = GenericFrameInfo::Builder;
|
||||
|
||||
@ -81,8 +81,7 @@ class ScreenshareLayers final : public Vp8FrameBufferController {
|
||||
GenericFrameInfo::DecodeTargetInfo(indication_symbols)),
|
||||
frame_config(frame_config) {}
|
||||
|
||||
absl::InlinedVector<GenericFrameInfo::DecodeTargetIndication, 10>
|
||||
decode_target_indications;
|
||||
absl::InlinedVector<DecodeTargetIndication, 10> decode_target_indications;
|
||||
Vp8FrameConfig frame_config;
|
||||
};
|
||||
|
||||
@ -140,7 +139,7 @@ class ScreenshareLayers final : public Vp8FrameBufferController {
|
||||
} layers_[kMaxNumTemporalLayers];
|
||||
|
||||
void UpdateHistograms();
|
||||
TemplateStructure GetTemplateStructure(int num_layers) const;
|
||||
FrameDependencyStructure GetTemplateStructure(int num_layers) const;
|
||||
|
||||
// Data for histogram statistics.
|
||||
struct Stats {
|
||||
|
||||
Reference in New Issue
Block a user