admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes deprecated BitrateAllocation alias.

Browse Source 
Bug: webrtc:9883
Change-Id: Ia14727a43c31241590889e48aded63dd8b30e181
Reviewed-on: https://webrtc-review.googlesource.com/c/107734
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25357}
This commit is contained in:
Sebastian Jansson 2018-10-25 11:14:33 +02:00 committed by Commit Bot
parent 2506839dba
commit 3eb1c72bb6
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common_types.h
View File

@ -349,9 +349,6 @@ struct SpatialLayer {
// settings such as resolution.
typedef SpatialLayer SimulcastStream;
// TODO(sprang): Remove this when downstream projects have been updated.
using BitrateAllocation = VideoBitrateAllocation;
// Bandwidth over-use detector options. These are used to drive
// experimentation with bandwidth estimation parameters.
// See modules/remote_bitrate_estimator/overuse_detector.h

4
modules/video_coding/codecs/h264/h264_encoder_impl.cc
View File

@ -310,7 +310,7 @@ int32_t H264EncoderImpl::InitEncode(const VideoCodec* inst,
}
SimulcastRateAllocator init_allocator(codec_);
BitrateAllocation allocation = init_allocator.GetAllocation(
VideoBitrateAllocation allocation = init_allocator.GetAllocation(
codec_.startBitrate * 1000, codec_.maxFramerate);
return SetRateAllocation(allocation, codec_.maxFramerate);
}
@ -339,7 +339,7 @@ int32_t H264EncoderImpl::RegisterEncodeCompleteCallback(
}
int32_t H264EncoderImpl::SetRateAllocation(
const BitrateAllocation& bitrate,
const VideoBitrateAllocation& bitrate,
uint32_t new_framerate) {
if (encoders_.empty())
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;

2
modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
View File

@ -393,7 +393,7 @@ TEST_F(TestVp9Impl, InterLayerPred) {
ConfigureSvc(num_spatial_layers);
codec_settings_.VP9()->frameDroppingOn = false;
BitrateAllocation bitrate_allocation;
VideoBitrateAllocation bitrate_allocation;
for (size_t i = 0; i < num_spatial_layers; ++i) {
bitrate_allocation.SetBitrate(
i, 0, codec_settings_.spatialLayers[i].targetBitrate * 1000);