From 2a74263e3f4329901ee29a17fc1de4b5366c1016 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Thu, 8 Nov 2018 12:01:17 +0100 Subject: [PATCH] Make the bitrate_allocator param optional to prepare for its removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in https://webrtc-review.googlesource.com/109040 Bug: webrtc:9513 Change-Id: I676e5e0242f068b12764a52bf8b6a6865ea7f120 Reviewed-on: https://webrtc-review.googlesource.com/c/110142 Reviewed-by: Erik Språng Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#25558} --- modules/video_coding/include/video_codec_initializer.h | 2 +- modules/video_coding/video_codec_initializer.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h index ee70810f62..6da5398967 100644 --- a/modules/video_coding/include/video_codec_initializer.h +++ b/modules/video_coding/include/video_codec_initializer.h @@ -34,7 +34,7 @@ class VideoCodecInitializer { const VideoEncoderConfig& config, const std::vector& streams, VideoCodec* codec, - std::unique_ptr* bitrate_allocator); + std::unique_ptr* bitrate_allocator = nullptr); // Create a bitrate allocator for the specified codec. static std::unique_ptr CreateBitrateAllocator( diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc index e7125ce278..b676a95e4f 100644 --- a/modules/video_coding/video_codec_initializer.cc +++ b/modules/video_coding/video_codec_initializer.cc @@ -41,7 +41,9 @@ bool VideoCodecInitializer::SetupCodec( } *codec = VideoEncoderConfigToVideoCodec(config, streams); - *bitrate_allocator = CreateBitrateAllocator(*codec); + if (bitrate_allocator) { + *bitrate_allocator = CreateBitrateAllocator(*codec); + } return true; }