This reverts commit c2406e4eaf7703c6c64d21318186adda791e09fd. Reason for revert: Reland by removing the conflict with the broken CL. Original change's description: > Revert "Move allocation and rtp conversion logic out of payload router." > > This reverts commit 1da4d79ba3275b3fa48cad3b2c0949e0d3b7afe7. > > Reason for revert: Need to revert https://webrtc-review.googlesource.com/c/src/+/88220 > > This causes a merge conflict. So need to revert this first. > > Original change's description: > > Move allocation and rtp conversion logic out of payload router. > > > > Makes it easier to write tests, and allows for moving rtp module > > ownership into the payload router in the future. > > > > The RtpPayloadParams class is split into declaration and definition and > > moved into separate files. > > > > Bug: webrtc:9517 > > Change-Id: I8700628edff19abcacfe8d3a20e4ba7476f712ad > > Reviewed-on: https://webrtc-review.googlesource.com/88564 > > Commit-Queue: Stefan Holmer <stefan@webrtc.org> > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#23983} > > TBR=sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > Change-Id: I342c4bf483d975c87c706fe7f76f44e2dc60fe4c > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9517 > Reviewed-on: https://webrtc-review.googlesource.com/88821 > Reviewed-by: JT Teh <jtteh@webrtc.org> > Commit-Queue: JT Teh <jtteh@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23991} TBR=sprang@webrtc.org,stefan@webrtc.org,srte@webrtc.org,lliuu@webrtc.org,jtteh@webrtc.org,tkchin@webrtc.org Change-Id: I154145cdbc668feee86dbe78860147a6954fee6c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9517 Reviewed-on: https://webrtc-review.googlesource.com/89020 Commit-Queue: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23996}
186 lines
5.7 KiB
C++
186 lines
5.7 KiB
C++
/*
|
|
* Copyright (c) 2018 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 "api/video/video_bitrate_allocation.h"
|
|
|
|
#include <limits>
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/numerics/safe_conversions.h"
|
|
#include "rtc_base/strings/string_builder.h"
|
|
#include "rtc_base/stringutils.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VideoBitrateAllocation::VideoBitrateAllocation() : sum_(0) {}
|
|
|
|
bool VideoBitrateAllocation::SetBitrate(size_t spatial_index,
|
|
size_t temporal_index,
|
|
uint32_t bitrate_bps) {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
RTC_CHECK_LT(temporal_index, kMaxTemporalStreams);
|
|
int64_t new_bitrate_sum_bps = sum_;
|
|
absl::optional<uint32_t>& layer_bitrate =
|
|
bitrates_[spatial_index][temporal_index];
|
|
if (layer_bitrate) {
|
|
RTC_DCHECK_LE(*layer_bitrate, sum_);
|
|
new_bitrate_sum_bps -= *layer_bitrate;
|
|
}
|
|
new_bitrate_sum_bps += bitrate_bps;
|
|
if (new_bitrate_sum_bps > kMaxBitrateBps)
|
|
return false;
|
|
|
|
layer_bitrate = bitrate_bps;
|
|
sum_ = rtc::dchecked_cast<uint32_t>(new_bitrate_sum_bps);
|
|
return true;
|
|
}
|
|
|
|
bool VideoBitrateAllocation::HasBitrate(size_t spatial_index,
|
|
size_t temporal_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
RTC_CHECK_LT(temporal_index, kMaxTemporalStreams);
|
|
return bitrates_[spatial_index][temporal_index].has_value();
|
|
}
|
|
|
|
uint32_t VideoBitrateAllocation::GetBitrate(size_t spatial_index,
|
|
size_t temporal_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
RTC_CHECK_LT(temporal_index, kMaxTemporalStreams);
|
|
return bitrates_[spatial_index][temporal_index].value_or(0);
|
|
}
|
|
|
|
// Whether the specific spatial layers has the bitrate set in any of its
|
|
// temporal layers.
|
|
bool VideoBitrateAllocation::IsSpatialLayerUsed(size_t spatial_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
for (size_t i = 0; i < kMaxTemporalStreams; ++i) {
|
|
if (bitrates_[spatial_index][i].has_value())
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Get the sum of all the temporal layer for a specific spatial layer.
|
|
uint32_t VideoBitrateAllocation::GetSpatialLayerSum(
|
|
size_t spatial_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
return GetTemporalLayerSum(spatial_index, kMaxTemporalStreams - 1);
|
|
}
|
|
|
|
uint32_t VideoBitrateAllocation::GetTemporalLayerSum(
|
|
size_t spatial_index,
|
|
size_t temporal_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
RTC_CHECK_LT(temporal_index, kMaxTemporalStreams);
|
|
uint32_t sum = 0;
|
|
for (size_t i = 0; i <= temporal_index; ++i) {
|
|
sum += bitrates_[spatial_index][i].value_or(0);
|
|
}
|
|
return sum;
|
|
}
|
|
|
|
std::vector<uint32_t> VideoBitrateAllocation::GetTemporalLayerAllocation(
|
|
size_t spatial_index) const {
|
|
RTC_CHECK_LT(spatial_index, kMaxSpatialLayers);
|
|
std::vector<uint32_t> temporal_rates;
|
|
|
|
// Find the highest temporal layer with a defined bitrate in order to
|
|
// determine the size of the temporal layer allocation.
|
|
for (size_t i = kMaxTemporalStreams; i > 0; --i) {
|
|
if (bitrates_[spatial_index][i - 1].has_value()) {
|
|
temporal_rates.resize(i);
|
|
break;
|
|
}
|
|
}
|
|
|
|
for (size_t i = 0; i < temporal_rates.size(); ++i) {
|
|
temporal_rates[i] = bitrates_[spatial_index][i].value_or(0);
|
|
}
|
|
|
|
return temporal_rates;
|
|
}
|
|
|
|
std::vector<absl::optional<VideoBitrateAllocation>>
|
|
VideoBitrateAllocation::GetSimulcastAllocations() const {
|
|
std::vector<absl::optional<VideoBitrateAllocation>> bitrates;
|
|
for (size_t si = 0; si < kMaxSpatialLayers; ++si) {
|
|
absl::optional<VideoBitrateAllocation> layer_bitrate;
|
|
if (IsSpatialLayerUsed(si)) {
|
|
layer_bitrate = VideoBitrateAllocation();
|
|
for (int tl = 0; tl < kMaxTemporalStreams; ++tl) {
|
|
if (HasBitrate(si, tl))
|
|
layer_bitrate->SetBitrate(0, tl, GetBitrate(si, tl));
|
|
}
|
|
}
|
|
bitrates.push_back(layer_bitrate);
|
|
}
|
|
return bitrates;
|
|
}
|
|
|
|
bool VideoBitrateAllocation::operator==(
|
|
const VideoBitrateAllocation& other) const {
|
|
for (size_t si = 0; si < kMaxSpatialLayers; ++si) {
|
|
for (size_t ti = 0; ti < kMaxTemporalStreams; ++ti) {
|
|
if (bitrates_[si][ti] != other.bitrates_[si][ti])
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
std::string VideoBitrateAllocation::ToString() const {
|
|
if (sum_ == 0)
|
|
return "VideoBitrateAllocation [ [] ]";
|
|
|
|
// Max string length in practice is 260, but let's have some overhead and
|
|
// round up to nearest power of two.
|
|
char string_buf[512];
|
|
rtc::SimpleStringBuilder ssb(string_buf);
|
|
|
|
ssb << "VideoBitrateAllocation [";
|
|
uint32_t spatial_cumulator = 0;
|
|
for (size_t si = 0; si < kMaxSpatialLayers; ++si) {
|
|
RTC_DCHECK_LE(spatial_cumulator, sum_);
|
|
if (spatial_cumulator == sum_)
|
|
break;
|
|
|
|
const uint32_t layer_sum = GetSpatialLayerSum(si);
|
|
if (layer_sum == sum_) {
|
|
ssb << " [";
|
|
} else {
|
|
if (si > 0)
|
|
ssb << ",";
|
|
ssb << '\n' << " [";
|
|
}
|
|
spatial_cumulator += layer_sum;
|
|
|
|
uint32_t temporal_cumulator = 0;
|
|
for (size_t ti = 0; ti < kMaxTemporalStreams; ++ti) {
|
|
RTC_DCHECK_LE(temporal_cumulator, layer_sum);
|
|
if (temporal_cumulator == layer_sum)
|
|
break;
|
|
|
|
if (ti > 0)
|
|
ssb << ", ";
|
|
|
|
uint32_t bitrate = bitrates_[si][ti].value_or(0);
|
|
ssb << bitrate;
|
|
temporal_cumulator += bitrate;
|
|
}
|
|
ssb << "]";
|
|
}
|
|
|
|
RTC_DCHECK_EQ(spatial_cumulator, sum_);
|
|
ssb << " ]";
|
|
return ssb.str();
|
|
}
|
|
|
|
} // namespace webrtc
|