Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc

Issue 2510583002: Reland #2 of Issue 2434073003: Extract bitrate allocation ... (Closed)
Patch Set: Addressed comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/video_coding/utility/simulcast_rate_allocator.h" 11 #include "webrtc/modules/video_coding/utility/simulcast_rate_allocator.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <memory>
15 #include <vector>
16 #include <utility>
17
18 #include "webrtc/base/checks.h"
14 19
15 namespace webrtc { 20 namespace webrtc {
16 21
17 webrtc::SimulcastRateAllocator::SimulcastRateAllocator(const VideoCodec& codec) 22 SimulcastRateAllocator::SimulcastRateAllocator(
18 : codec_(codec) {} 23 const VideoCodec& codec,
24 std::unique_ptr<TemporalLayersFactory> tl_factory)
25 : codec_(codec), tl_factory_(std::move(tl_factory)) {
26 if (tl_factory_.get())
27 tl_factory_->SetListener(this);
28 }
19 29
20 std::vector<uint32_t> webrtc::SimulcastRateAllocator::GetAllocation( 30 void SimulcastRateAllocator::OnTemporalLayersCreated(int simulcast_id,
21 uint32_t bitrate_kbps) const { 31 TemporalLayers* layers) {
22 // Always allocate enough bitrate for the minimum bitrate of the first layer. 32 RTC_DCHECK(temporal_layers_.find(simulcast_id) == temporal_layers_.end());
23 // Suspending below min bitrate is controlled outside the codec implementation 33 temporal_layers_[simulcast_id] = layers;
24 // and is not overridden by this. 34 }
25 const uint32_t min_bitrate_bps = codec_.numberOfSimulcastStreams == 0
26 ? codec_.minBitrate
27 : codec_.simulcastStream[0].minBitrate;
28 uint32_t left_to_allocate = std::max(min_bitrate_bps, bitrate_kbps);
29 if (codec_.maxBitrate)
30 left_to_allocate = std::min(left_to_allocate, codec_.maxBitrate);
31 35
32 if (codec_.numberOfSimulcastStreams < 2) { 36 BitrateAllocation SimulcastRateAllocator::GetAllocation(
37 uint32_t total_bitrate_bps,
38 uint32_t framerate) {
39 uint32_t left_to_allocate = total_bitrate_bps;
40 if (codec_.maxBitrate && codec_.maxBitrate * 1000 < left_to_allocate)
41 left_to_allocate = codec_.maxBitrate * 1000;
42
43 BitrateAllocation allocated_bitrates_bps;
44 if (codec_.numberOfSimulcastStreams == 0) {
33 // No simulcast, just set the target as this has been capped already. 45 // No simulcast, just set the target as this has been capped already.
34 return std::vector<uint32_t>(1, left_to_allocate); 46 allocated_bitrates_bps.SetBitrate(
47 0, 0, std::max(codec_.minBitrate * 1000, left_to_allocate));
48 } else {
49 // Always allocate enough bitrate for the minimum bitrate of the first
50 // layer. Suspending below min bitrate is controlled outside the codec
51 // implementation and is not overridden by this.
52 left_to_allocate =
53 std::max(codec_.simulcastStream[0].minBitrate * 1000, left_to_allocate);
54
55 // Begin by allocating bitrate to simulcast streams, putting all bitrate in
56 // temporal layer 0. We'll then distribute this bitrate, across potential
57 // temporal layers, when stream allocation is done.
58
59 // Allocate up to the target bitrate for each simulcast layer.
60 size_t layer = 0;
61 for (; layer < codec_.numberOfSimulcastStreams; ++layer) {
62 const SimulcastStream& stream = codec_.simulcastStream[layer];
63 if (left_to_allocate < stream.minBitrate * 1000)
64 break;
65 uint32_t allocation =
66 std::min(left_to_allocate, stream.targetBitrate * 1000);
67 allocated_bitrates_bps.SetBitrate(layer, 0, allocation);
68 RTC_DCHECK_LE(allocation, left_to_allocate);
69 left_to_allocate -= allocation;
70 }
71
72 // Next, try allocate remaining bitrate, up to max bitrate, in top stream.
73 // TODO(sprang): Allocate up to max bitrate for all layers once we have a
74 // better idea of possible performance implications.
75 if (left_to_allocate > 0) {
76 size_t active_layer = layer - 1;
77 const SimulcastStream& stream = codec_.simulcastStream[active_layer];
78 uint32_t bitrate_bps =
79 allocated_bitrates_bps.GetSpatialLayerSum(active_layer);
80 uint32_t allocation =
81 std::min(left_to_allocate, stream.maxBitrate * 1000 - bitrate_bps);
82 bitrate_bps += allocation;
83 RTC_DCHECK_LE(allocation, left_to_allocate);
84 left_to_allocate -= allocation;
85 allocated_bitrates_bps.SetBitrate(active_layer, 0, bitrate_bps);
86 }
35 } 87 }
36 88
37 // Initialize bitrates with zeroes. 89 const int num_spatial_streams =
38 std::vector<uint32_t> allocated_bitrates_bps(codec_.numberOfSimulcastStreams, 90 std::max(1, static_cast<int>(codec_.numberOfSimulcastStreams));
39 0);
40 91
41 // First try to allocate up to the target bitrate for each substream. 92 // Finally, distribute the bitrate for the simulcast streams across the
42 size_t layer = 0; 93 // available temporal layers.
43 for (; layer < codec_.numberOfSimulcastStreams; ++layer) { 94 for (int simulcast_id = 0; simulcast_id < num_spatial_streams;
44 const SimulcastStream& stream = codec_.simulcastStream[layer]; 95 ++simulcast_id) {
45 if (left_to_allocate < stream.minBitrate) 96 auto tl_it = temporal_layers_.find(simulcast_id);
46 break; 97 if (tl_it == temporal_layers_.end())
47 uint32_t allocation = std::min(left_to_allocate, stream.targetBitrate); 98 continue; // TODO(sprang): If > 1 SS, assume default TL alloc?
48 allocated_bitrates_bps[layer] = allocation;
49 left_to_allocate -= allocation;
50 }
51 99
52 // Next, try allocate remaining bitrate, up to max bitrate, in top layer. 100 uint32_t target_bitrate_kbps =
53 // TODO(sprang): Allocate up to max bitrate for all layers once we have a 101 allocated_bitrates_bps.GetBitrate(simulcast_id, 0) / 1000;
54 // better idea of possible performance implications. 102 RTC_DCHECK_EQ(
55 if (left_to_allocate > 0) { 103 target_bitrate_kbps,
56 size_t active_layer = layer - 1; 104 allocated_bitrates_bps.GetSpatialLayerSum(simulcast_id) / 1000);
57 const SimulcastStream& stream = codec_.simulcastStream[active_layer]; 105 uint32_t max_bitrate_kbps;
58 uint32_t allocation = 106 if (num_spatial_streams == 1) {
59 std::min(left_to_allocate, 107 max_bitrate_kbps = codec_.maxBitrate;
60 stream.maxBitrate - allocated_bitrates_bps[active_layer]); 108 const int num_temporal_streams =
61 left_to_allocate -= allocation; 109 codec_.numberOfSimulcastStreams == 0
62 allocated_bitrates_bps[active_layer] += allocation; 110 ? codec_.VP8().numberOfTemporalLayers
111 : codec_.simulcastStream[0].numberOfTemporalLayers;
112
113 // TODO(holmer): This is a temporary hack for screensharing, where we
114 // interpret the startBitrate as the encoder target bitrate. This is
115 // to allow for a different max bitrate, so if the codec can't meet
116 // the target we still allow it to overshoot up to the max before dropping
117 // frames. This hack should be improved.
118 if (codec_.mode == kScreensharing && codec_.targetBitrate > 0 &&
119 num_temporal_streams == 2) {
120 int tl0_bitrate = std::min(codec_.targetBitrate, target_bitrate_kbps);
121 max_bitrate_kbps = std::min(codec_.maxBitrate, target_bitrate_kbps);
122 target_bitrate_kbps = tl0_bitrate;
123 }
124 } else {
125 max_bitrate_kbps = codec_.simulcastStream[simulcast_id].maxBitrate;
126 }
127
128 std::vector<uint32_t> tl_allocation = tl_it->second->OnRatesUpdated(
129 target_bitrate_kbps, max_bitrate_kbps, framerate);
130
131 for (size_t tl_index = 0; tl_index < tl_allocation.size(); ++tl_index) {
132 allocated_bitrates_bps.SetBitrate(simulcast_id, tl_index,
133 tl_allocation[tl_index] * 1000);
134 }
63 } 135 }
64 136
65 return allocated_bitrates_bps; 137 return allocated_bitrates_bps;
66 } 138 }
67 139
68 uint32_t SimulcastRateAllocator::GetPreferedBitrate() const { 140 uint32_t SimulcastRateAllocator::GetPreferredBitrateBps(uint32_t framerate) {
69 std::vector<uint32_t> rates = GetAllocation(codec_.maxBitrate); 141 BitrateAllocation allocation =
70 uint32_t preferred_bitrate = 0; 142 GetAllocation(codec_.maxBitrate * 1000, framerate);
71 for (const uint32_t& rate : rates) { 143 return allocation.get_sum_bps();
72 preferred_bitrate += rate;
73 }
74 return preferred_bitrate;
75 } 144 }
76 145
77 const VideoCodec& webrtc::SimulcastRateAllocator::GetCodec() const { 146 const VideoCodec& webrtc::SimulcastRateAllocator::GetCodec() const {
78 return codec_; 147 return codec_;
79 } 148 }
80 149
81 } // namespace webrtc 150 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698