Add S3T3 video scalability structure
Bug: None Change-Id: I93760b501ff712ca2f7a9dfa3cba6ed5245e4f4b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208080 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33297}
This commit is contained in:
Danil Chapovalov
committed by
Commit Bot
Commit Bot
parent
0f71871cad
commit
735e33fae0
@ -36,8 +36,8 @@ rtc_source_set("scalability_structures") {
|
||||
"scalability_structure_key_svc.h",
|
||||
"scalability_structure_l2t2_key_shift.cc",
|
||||
"scalability_structure_l2t2_key_shift.h",
|
||||
"scalability_structure_s2t1.cc",
|
||||
"scalability_structure_s2t1.h",
|
||||
"scalability_structure_simulcast.cc",
|
||||
"scalability_structure_simulcast.h",
|
||||
]
|
||||
deps = [
|
||||
":scalable_video_controller",
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#include "modules/video_coding/svc/scalability_structure_full_svc.h"
|
||||
#include "modules/video_coding/svc/scalability_structure_key_svc.h"
|
||||
#include "modules/video_coding/svc/scalability_structure_l2t2_key_shift.h"
|
||||
#include "modules/video_coding/svc/scalability_structure_s2t1.h"
|
||||
#include "modules/video_coding/svc/scalability_structure_simulcast.h"
|
||||
#include "modules/video_coding/svc/scalable_video_controller.h"
|
||||
#include "modules/video_coding/svc/scalable_video_controller_no_layering.h"
|
||||
#include "rtc_base/checks.h"
|
||||
@ -58,6 +58,7 @@ constexpr NamedStructureFactory kFactories[] = {
|
||||
{"L3T3", Create<ScalabilityStructureL3T3>},
|
||||
{"L3T3_KEY", Create<ScalabilityStructureL3T3Key>},
|
||||
{"S2T1", Create<ScalabilityStructureS2T1>},
|
||||
{"S3T3", Create<ScalabilityStructureS3T3>},
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#include "modules/video_coding/svc/scalability_structure_s2t1.h"
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/base/macros.h"
|
||||
#include "api/transport/rtp/dependency_descriptor.h"
|
||||
#include "rtc_base/checks.h"
|
||||
#include "rtc_base/logging.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
constexpr int ScalabilityStructureS2T1::kNumSpatialLayers;
|
||||
|
||||
ScalabilityStructureS2T1::~ScalabilityStructureS2T1() = default;
|
||||
|
||||
ScalableVideoController::StreamLayersConfig
|
||||
ScalabilityStructureS2T1::StreamConfig() const {
|
||||
StreamLayersConfig result;
|
||||
result.num_spatial_layers = kNumSpatialLayers;
|
||||
result.num_temporal_layers = 1;
|
||||
result.scaling_factor_num[0] = 1;
|
||||
result.scaling_factor_den[0] = 2;
|
||||
return result;
|
||||
}
|
||||
|
||||
FrameDependencyStructure ScalabilityStructureS2T1::DependencyStructure() const {
|
||||
FrameDependencyStructure structure;
|
||||
structure.num_decode_targets = kNumSpatialLayers;
|
||||
structure.num_chains = kNumSpatialLayers;
|
||||
structure.decode_target_protected_by_chain = {0, 1};
|
||||
structure.templates.resize(4);
|
||||
structure.templates[0].S(0).Dtis("S-").ChainDiffs({2, 1}).FrameDiffs({2});
|
||||
structure.templates[1].S(0).Dtis("S-").ChainDiffs({0, 0});
|
||||
structure.templates[2].S(1).Dtis("-S").ChainDiffs({1, 2}).FrameDiffs({2});
|
||||
structure.templates[3].S(1).Dtis("-S").ChainDiffs({1, 0});
|
||||
return structure;
|
||||
}
|
||||
|
||||
std::vector<ScalableVideoController::LayerFrameConfig>
|
||||
ScalabilityStructureS2T1::NextFrameConfig(bool restart) {
|
||||
if (restart) {
|
||||
can_reference_frame_for_spatial_id_.reset();
|
||||
}
|
||||
std::vector<LayerFrameConfig> configs;
|
||||
configs.reserve(kNumSpatialLayers);
|
||||
for (int sid = 0; sid < kNumSpatialLayers; ++sid) {
|
||||
if (!active_decode_targets_[sid]) {
|
||||
can_reference_frame_for_spatial_id_.reset(sid);
|
||||
continue;
|
||||
}
|
||||
configs.emplace_back();
|
||||
LayerFrameConfig& config = configs.back().S(sid);
|
||||
if (can_reference_frame_for_spatial_id_[sid]) {
|
||||
config.ReferenceAndUpdate(sid);
|
||||
} else {
|
||||
config.Keyframe().Update(sid);
|
||||
can_reference_frame_for_spatial_id_.set(sid);
|
||||
}
|
||||
}
|
||||
|
||||
return configs;
|
||||
}
|
||||
|
||||
GenericFrameInfo ScalabilityStructureS2T1::OnEncodeDone(
|
||||
const LayerFrameConfig& config) {
|
||||
GenericFrameInfo frame_info;
|
||||
frame_info.spatial_id = config.SpatialId();
|
||||
frame_info.temporal_id = config.TemporalId();
|
||||
frame_info.encoder_buffers = config.Buffers();
|
||||
frame_info.decode_target_indications = {
|
||||
config.SpatialId() == 0 ? DecodeTargetIndication::kSwitch
|
||||
: DecodeTargetIndication::kNotPresent,
|
||||
config.SpatialId() == 1 ? DecodeTargetIndication::kSwitch
|
||||
: DecodeTargetIndication::kNotPresent,
|
||||
};
|
||||
frame_info.part_of_chain = {config.SpatialId() == 0, config.SpatialId() == 1};
|
||||
frame_info.active_decode_targets = active_decode_targets_;
|
||||
return frame_info;
|
||||
}
|
||||
|
||||
void ScalabilityStructureS2T1::OnRatesUpdated(
|
||||
const VideoBitrateAllocation& bitrates) {
|
||||
active_decode_targets_.set(0, bitrates.GetBitrate(/*sid=*/0, /*tid=*/0) > 0);
|
||||
active_decode_targets_.set(1, bitrates.GetBitrate(/*sid=*/1, /*tid=*/0) > 0);
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
@ -1,45 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_
|
||||
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "api/transport/rtp/dependency_descriptor.h"
|
||||
#include "api/video/video_bitrate_allocation.h"
|
||||
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
|
||||
#include "modules/video_coding/svc/scalable_video_controller.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
// S1 0--0--0-
|
||||
// ...
|
||||
// S0 0--0--0-
|
||||
class ScalabilityStructureS2T1 : public ScalableVideoController {
|
||||
public:
|
||||
~ScalabilityStructureS2T1() override;
|
||||
|
||||
StreamLayersConfig StreamConfig() const override;
|
||||
FrameDependencyStructure DependencyStructure() const override;
|
||||
|
||||
std::vector<LayerFrameConfig> NextFrameConfig(bool restart) override;
|
||||
GenericFrameInfo OnEncodeDone(const LayerFrameConfig& config) override;
|
||||
void OnRatesUpdated(const VideoBitrateAllocation& bitrates) override;
|
||||
|
||||
private:
|
||||
static constexpr int kNumSpatialLayers = 2;
|
||||
|
||||
std::bitset<kNumSpatialLayers> can_reference_frame_for_spatial_id_;
|
||||
std::bitset<32> active_decode_targets_ = 0b11;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_S2T1_H_
|
||||
270
modules/video_coding/svc/scalability_structure_simulcast.cc
Normal file
270
modules/video_coding/svc/scalability_structure_simulcast.cc
Normal file
@ -0,0 +1,270 @@
|
||||
/*
|
||||
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#include "modules/video_coding/svc/scalability_structure_simulcast.h"
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/base/macros.h"
|
||||
#include "api/transport/rtp/dependency_descriptor.h"
|
||||
#include "rtc_base/checks.h"
|
||||
#include "rtc_base/logging.h"
|
||||
|
||||
namespace webrtc {
|
||||
namespace {
|
||||
|
||||
DecodeTargetIndication
|
||||
Dti(int sid, int tid, const ScalableVideoController::LayerFrameConfig& config) {
|
||||
if (sid != config.SpatialId() || tid < config.TemporalId()) {
|
||||
return DecodeTargetIndication::kNotPresent;
|
||||
}
|
||||
if (tid == 0) {
|
||||
RTC_DCHECK_EQ(config.TemporalId(), 0);
|
||||
return DecodeTargetIndication::kSwitch;
|
||||
}
|
||||
if (tid == config.TemporalId()) {
|
||||
return DecodeTargetIndication::kDiscardable;
|
||||
}
|
||||
RTC_DCHECK_GT(tid, config.TemporalId());
|
||||
return DecodeTargetIndication::kSwitch;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
constexpr int ScalabilityStructureSimulcast::kMaxNumSpatialLayers;
|
||||
constexpr int ScalabilityStructureSimulcast::kMaxNumTemporalLayers;
|
||||
|
||||
ScalabilityStructureSimulcast::ScalabilityStructureSimulcast(
|
||||
int num_spatial_layers,
|
||||
int num_temporal_layers)
|
||||
: num_spatial_layers_(num_spatial_layers),
|
||||
num_temporal_layers_(num_temporal_layers),
|
||||
active_decode_targets_(
|
||||
(uint32_t{1} << (num_spatial_layers * num_temporal_layers)) - 1) {
|
||||
RTC_DCHECK_LE(num_spatial_layers, kMaxNumSpatialLayers);
|
||||
RTC_DCHECK_LE(num_temporal_layers, kMaxNumTemporalLayers);
|
||||
}
|
||||
|
||||
ScalabilityStructureSimulcast::~ScalabilityStructureSimulcast() = default;
|
||||
|
||||
ScalableVideoController::StreamLayersConfig
|
||||
ScalabilityStructureSimulcast::StreamConfig() const {
|
||||
StreamLayersConfig result;
|
||||
result.num_spatial_layers = num_spatial_layers_;
|
||||
result.num_temporal_layers = num_temporal_layers_;
|
||||
result.scaling_factor_num[num_spatial_layers_ - 1] = 1;
|
||||
result.scaling_factor_den[num_spatial_layers_ - 1] = 1;
|
||||
for (int sid = num_spatial_layers_ - 1; sid > 0; --sid) {
|
||||
result.scaling_factor_num[sid - 1] = 1;
|
||||
result.scaling_factor_den[sid - 1] = 2 * result.scaling_factor_den[sid];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
bool ScalabilityStructureSimulcast::TemporalLayerIsActive(int tid) const {
|
||||
if (tid >= num_temporal_layers_) {
|
||||
return false;
|
||||
}
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
if (DecodeTargetIsActive(sid, tid)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
ScalabilityStructureSimulcast::FramePattern
|
||||
ScalabilityStructureSimulcast::NextPattern() const {
|
||||
switch (last_pattern_) {
|
||||
case kNone:
|
||||
case kDeltaT2B:
|
||||
return kDeltaT0;
|
||||
case kDeltaT2A:
|
||||
if (TemporalLayerIsActive(1)) {
|
||||
return kDeltaT1;
|
||||
}
|
||||
return kDeltaT0;
|
||||
case kDeltaT1:
|
||||
if (TemporalLayerIsActive(2)) {
|
||||
return kDeltaT2B;
|
||||
}
|
||||
return kDeltaT0;
|
||||
case kDeltaT0:
|
||||
if (TemporalLayerIsActive(2)) {
|
||||
return kDeltaT2A;
|
||||
}
|
||||
if (TemporalLayerIsActive(1)) {
|
||||
return kDeltaT1;
|
||||
}
|
||||
return kDeltaT0;
|
||||
}
|
||||
RTC_NOTREACHED();
|
||||
return kDeltaT0;
|
||||
}
|
||||
|
||||
std::vector<ScalableVideoController::LayerFrameConfig>
|
||||
ScalabilityStructureSimulcast::NextFrameConfig(bool restart) {
|
||||
std::vector<LayerFrameConfig> configs;
|
||||
if (active_decode_targets_.none()) {
|
||||
last_pattern_ = kNone;
|
||||
return configs;
|
||||
}
|
||||
configs.reserve(num_spatial_layers_);
|
||||
|
||||
if (last_pattern_ == kNone || restart) {
|
||||
can_reference_t0_frame_for_spatial_id_.reset();
|
||||
last_pattern_ = kNone;
|
||||
}
|
||||
FramePattern current_pattern = NextPattern();
|
||||
|
||||
switch (current_pattern) {
|
||||
case kDeltaT0:
|
||||
// Disallow temporal references cross T0 on higher temporal layers.
|
||||
can_reference_t1_frame_for_spatial_id_.reset();
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
if (!DecodeTargetIsActive(sid, /*tid=*/0)) {
|
||||
// Next frame from the spatial layer `sid` shouldn't depend on
|
||||
// potentially old previous frame from the spatial layer `sid`.
|
||||
can_reference_t0_frame_for_spatial_id_.reset(sid);
|
||||
continue;
|
||||
}
|
||||
configs.emplace_back();
|
||||
ScalableVideoController::LayerFrameConfig& config = configs.back();
|
||||
config.S(sid).T(0);
|
||||
|
||||
if (can_reference_t0_frame_for_spatial_id_[sid]) {
|
||||
config.ReferenceAndUpdate(BufferIndex(sid, /*tid=*/0));
|
||||
} else {
|
||||
config.Keyframe().Update(BufferIndex(sid, /*tid=*/0));
|
||||
}
|
||||
can_reference_t0_frame_for_spatial_id_.set(sid);
|
||||
}
|
||||
break;
|
||||
case kDeltaT1:
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
if (!DecodeTargetIsActive(sid, /*tid=*/1) ||
|
||||
!can_reference_t0_frame_for_spatial_id_[sid]) {
|
||||
continue;
|
||||
}
|
||||
configs.emplace_back();
|
||||
ScalableVideoController::LayerFrameConfig& config = configs.back();
|
||||
config.S(sid).T(1).Reference(BufferIndex(sid, /*tid=*/0));
|
||||
// Save frame only if there is a higher temporal layer that may need it.
|
||||
if (num_temporal_layers_ > 2) {
|
||||
config.Update(BufferIndex(sid, /*tid=*/1));
|
||||
}
|
||||
}
|
||||
break;
|
||||
case kDeltaT2A:
|
||||
case kDeltaT2B:
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
if (!DecodeTargetIsActive(sid, /*tid=*/2) ||
|
||||
!can_reference_t0_frame_for_spatial_id_[sid]) {
|
||||
continue;
|
||||
}
|
||||
configs.emplace_back();
|
||||
ScalableVideoController::LayerFrameConfig& config = configs.back();
|
||||
config.S(sid).T(2);
|
||||
if (can_reference_t1_frame_for_spatial_id_[sid]) {
|
||||
config.Reference(BufferIndex(sid, /*tid=*/1));
|
||||
} else {
|
||||
config.Reference(BufferIndex(sid, /*tid=*/0));
|
||||
}
|
||||
}
|
||||
break;
|
||||
case kNone:
|
||||
RTC_NOTREACHED();
|
||||
break;
|
||||
}
|
||||
|
||||
last_pattern_ = current_pattern;
|
||||
return configs;
|
||||
}
|
||||
|
||||
GenericFrameInfo ScalabilityStructureSimulcast::OnEncodeDone(
|
||||
const LayerFrameConfig& config) {
|
||||
if (config.TemporalId() == 1) {
|
||||
can_reference_t1_frame_for_spatial_id_.set(config.SpatialId());
|
||||
}
|
||||
GenericFrameInfo frame_info;
|
||||
frame_info.spatial_id = config.SpatialId();
|
||||
frame_info.temporal_id = config.TemporalId();
|
||||
frame_info.encoder_buffers = config.Buffers();
|
||||
frame_info.decode_target_indications.reserve(num_spatial_layers_ *
|
||||
num_temporal_layers_);
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
for (int tid = 0; tid < num_temporal_layers_; ++tid) {
|
||||
frame_info.decode_target_indications.push_back(Dti(sid, tid, config));
|
||||
}
|
||||
}
|
||||
frame_info.part_of_chain.assign(num_spatial_layers_, false);
|
||||
if (config.TemporalId() == 0) {
|
||||
frame_info.part_of_chain[config.SpatialId()] = true;
|
||||
}
|
||||
frame_info.active_decode_targets = active_decode_targets_;
|
||||
return frame_info;
|
||||
}
|
||||
|
||||
void ScalabilityStructureSimulcast::OnRatesUpdated(
|
||||
const VideoBitrateAllocation& bitrates) {
|
||||
for (int sid = 0; sid < num_spatial_layers_; ++sid) {
|
||||
// Enable/disable spatial layers independetely.
|
||||
bool active = true;
|
||||
for (int tid = 0; tid < num_temporal_layers_; ++tid) {
|
||||
// To enable temporal layer, require bitrates for lower temporal layers.
|
||||
active = active && bitrates.GetBitrate(sid, tid) > 0;
|
||||
SetDecodeTargetIsActive(sid, tid, active);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FrameDependencyStructure ScalabilityStructureS2T1::DependencyStructure() const {
|
||||
FrameDependencyStructure structure;
|
||||
structure.num_decode_targets = 2;
|
||||
structure.num_chains = 2;
|
||||
structure.decode_target_protected_by_chain = {0, 1};
|
||||
structure.templates.resize(4);
|
||||
structure.templates[0].S(0).Dtis("S-").ChainDiffs({2, 1}).FrameDiffs({2});
|
||||
structure.templates[1].S(0).Dtis("S-").ChainDiffs({0, 0});
|
||||
structure.templates[2].S(1).Dtis("-S").ChainDiffs({1, 2}).FrameDiffs({2});
|
||||
structure.templates[3].S(1).Dtis("-S").ChainDiffs({1, 0});
|
||||
return structure;
|
||||
}
|
||||
|
||||
FrameDependencyStructure ScalabilityStructureS3T3::DependencyStructure() const {
|
||||
FrameDependencyStructure structure;
|
||||
structure.num_decode_targets = 9;
|
||||
structure.num_chains = 3;
|
||||
structure.decode_target_protected_by_chain = {0, 0, 0, 1, 1, 1, 2, 2, 2};
|
||||
auto& t = structure.templates;
|
||||
t.resize(15);
|
||||
// Templates are shown in the order frames following them appear in the
|
||||
// stream, but in `structure.templates` array templates are sorted by
|
||||
// (`spatial_id`, `temporal_id`) since that is a dependency descriptor
|
||||
// requirement. Indexes are written in hex for nicer alignment.
|
||||
t[0x1].S(0).T(0).Dtis("SSS------").ChainDiffs({0, 0, 0});
|
||||
t[0x6].S(1).T(0).Dtis("---SSS---").ChainDiffs({1, 0, 0});
|
||||
t[0xB].S(2).T(0).Dtis("------SSS").ChainDiffs({2, 1, 0});
|
||||
t[0x3].S(0).T(2).Dtis("--D------").ChainDiffs({3, 2, 1}).FrameDiffs({3});
|
||||
t[0x8].S(1).T(2).Dtis("-----D---").ChainDiffs({4, 3, 2}).FrameDiffs({3});
|
||||
t[0xD].S(2).T(2).Dtis("--------D").ChainDiffs({5, 4, 3}).FrameDiffs({3});
|
||||
t[0x2].S(0).T(1).Dtis("-DS------").ChainDiffs({6, 5, 4}).FrameDiffs({6});
|
||||
t[0x7].S(1).T(1).Dtis("----DS---").ChainDiffs({7, 6, 5}).FrameDiffs({6});
|
||||
t[0xC].S(2).T(1).Dtis("-------DS").ChainDiffs({8, 7, 6}).FrameDiffs({6});
|
||||
t[0x4].S(0).T(2).Dtis("--D------").ChainDiffs({9, 8, 7}).FrameDiffs({3});
|
||||
t[0x9].S(1).T(2).Dtis("-----D---").ChainDiffs({10, 9, 8}).FrameDiffs({3});
|
||||
t[0xE].S(2).T(2).Dtis("--------D").ChainDiffs({11, 10, 9}).FrameDiffs({3});
|
||||
t[0x0].S(0).T(0).Dtis("SSS------").ChainDiffs({12, 11, 10}).FrameDiffs({12});
|
||||
t[0x5].S(1).T(0).Dtis("---SSS---").ChainDiffs({1, 12, 11}).FrameDiffs({12});
|
||||
t[0xA].S(2).T(0).Dtis("------SSS").ChainDiffs({2, 1, 12}).FrameDiffs({12});
|
||||
return structure;
|
||||
}
|
||||
|
||||
} // namespace webrtc
|
||||
89
modules/video_coding/svc/scalability_structure_simulcast.h
Normal file
89
modules/video_coding/svc/scalability_structure_simulcast.h
Normal file
@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
#ifndef MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_SIMULCAST_H_
|
||||
#define MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_SIMULCAST_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "api/transport/rtp/dependency_descriptor.h"
|
||||
#include "api/video/video_bitrate_allocation.h"
|
||||
#include "common_video/generic_frame_descriptor/generic_frame_info.h"
|
||||
#include "modules/video_coding/svc/scalable_video_controller.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
// Scalability structure with multiple independent spatial layers each with the
|
||||
// same temporal layering.
|
||||
class ScalabilityStructureSimulcast : public ScalableVideoController {
|
||||
public:
|
||||
ScalabilityStructureSimulcast(int num_spatial_layers,
|
||||
int num_temporal_layers);
|
||||
~ScalabilityStructureSimulcast() override;
|
||||
|
||||
StreamLayersConfig StreamConfig() const override;
|
||||
std::vector<LayerFrameConfig> NextFrameConfig(bool restart) override;
|
||||
GenericFrameInfo OnEncodeDone(const LayerFrameConfig& config) override;
|
||||
void OnRatesUpdated(const VideoBitrateAllocation& bitrates) override;
|
||||
|
||||
private:
|
||||
enum FramePattern {
|
||||
kNone,
|
||||
kDeltaT2A,
|
||||
kDeltaT1,
|
||||
kDeltaT2B,
|
||||
kDeltaT0,
|
||||
};
|
||||
static constexpr int kMaxNumSpatialLayers = 3;
|
||||
static constexpr int kMaxNumTemporalLayers = 3;
|
||||
|
||||
// Index of the buffer to store last frame for layer (`sid`, `tid`)
|
||||
int BufferIndex(int sid, int tid) const {
|
||||
return tid * num_spatial_layers_ + sid;
|
||||
}
|
||||
bool DecodeTargetIsActive(int sid, int tid) const {
|
||||
return active_decode_targets_[sid * num_temporal_layers_ + tid];
|
||||
}
|
||||
void SetDecodeTargetIsActive(int sid, int tid, bool value) {
|
||||
active_decode_targets_.set(sid * num_temporal_layers_ + tid, value);
|
||||
}
|
||||
FramePattern NextPattern() const;
|
||||
bool TemporalLayerIsActive(int tid) const;
|
||||
|
||||
const int num_spatial_layers_;
|
||||
const int num_temporal_layers_;
|
||||
|
||||
FramePattern last_pattern_ = kNone;
|
||||
std::bitset<kMaxNumSpatialLayers> can_reference_t0_frame_for_spatial_id_ = 0;
|
||||
std::bitset<kMaxNumSpatialLayers> can_reference_t1_frame_for_spatial_id_ = 0;
|
||||
std::bitset<32> active_decode_targets_;
|
||||
};
|
||||
|
||||
// S1 0--0--0-
|
||||
// ...
|
||||
// S0 0--0--0-
|
||||
class ScalabilityStructureS2T1 : public ScalabilityStructureSimulcast {
|
||||
public:
|
||||
ScalabilityStructureS2T1() : ScalabilityStructureSimulcast(2, 1) {}
|
||||
~ScalabilityStructureS2T1() override = default;
|
||||
|
||||
FrameDependencyStructure DependencyStructure() const override;
|
||||
};
|
||||
|
||||
class ScalabilityStructureS3T3 : public ScalabilityStructureSimulcast {
|
||||
public:
|
||||
ScalabilityStructureS3T3() : ScalabilityStructureSimulcast(3, 3) {}
|
||||
~ScalabilityStructureS3T3() override = default;
|
||||
|
||||
FrameDependencyStructure DependencyStructure() const override;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // MODULES_VIDEO_CODING_SVC_SCALABILITY_STRUCTURE_SIMULCAST_H_
|
||||
@ -300,6 +300,7 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
SvcTestParam{"L3T1", /*num_temporal_units=*/3},
|
||||
SvcTestParam{"L3T3", /*num_temporal_units=*/8},
|
||||
SvcTestParam{"S2T1", /*num_temporal_units=*/3},
|
||||
SvcTestParam{"S3T3", /*num_temporal_units=*/8},
|
||||
SvcTestParam{"L2T2", /*num_temporal_units=*/4},
|
||||
SvcTestParam{"L2T2_KEY", /*num_temporal_units=*/4},
|
||||
SvcTestParam{"L2T2_KEY_SHIFT", /*num_temporal_units=*/4},
|
||||
|
||||
Reference in New Issue
Block a user