From 3eb1c72bb64704978b4f0578514fba28adce02f8 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Thu, 25 Oct 2018 11:14:33 +0200 Subject: [PATCH] Removes deprecated BitrateAllocation alias. Bug: webrtc:9883 Change-Id: Ia14727a43c31241590889e48aded63dd8b30e181 Reviewed-on: https://webrtc-review.googlesource.com/c/107734 Reviewed-by: Stefan Holmer Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#25357} --- common_types.h | 3 --- modules/video_coding/codecs/h264/h264_encoder_impl.cc | 4 ++-- modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common_types.h b/common_types.h index 0c62bbc828..b2fcf17a48 100644 --- a/common_types.h +++ b/common_types.h @@ -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 diff --git a/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/modules/video_coding/codecs/h264/h264_encoder_impl.cc index 4effcdbc52..00e8f7ee8d 100644 --- a/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -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; diff --git a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc index 4733ad979a..c4703c0ded 100644 --- a/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc +++ b/modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc @@ -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);