| commit | 2a74263e3f4329901ee29a17fc1de4b5366c1016 | [log] [tgz] |
|---|---|---|
| author | Oleh Prypin <oprypin@webrtc.org> | Thu Nov 08 11:01:17 2018 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Nov 08 12:59:46 2018 |
| tree | 513f53a6b13e4178159abacb2f23598e83ef75bc | |
| parent | cd2e1051284078e032e82a25259f14a87c668ffe [diff] |
Make the bitrate_allocator param optional to prepare for its removal 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 <sprang@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25558}
diff --git a/modules/video_coding/include/video_codec_initializer.h b/modules/video_coding/include/video_codec_initializer.h index ee70810..6da5398 100644 --- a/modules/video_coding/include/video_codec_initializer.h +++ b/modules/video_coding/include/video_codec_initializer.h
@@ -34,7 +34,7 @@ const VideoEncoderConfig& config, const std::vector<VideoStream>& streams, VideoCodec* codec, - std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator); + std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator = nullptr); // Create a bitrate allocator for the specified codec. static std::unique_ptr<VideoBitrateAllocator> CreateBitrateAllocator(
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc index e7125ce..b676a95 100644 --- a/modules/video_coding/video_codec_initializer.cc +++ b/modules/video_coding/video_codec_initializer.cc
@@ -41,7 +41,9 @@ } *codec = VideoEncoderConfigToVideoCodec(config, streams); - *bitrate_allocator = CreateBitrateAllocator(*codec); + if (bitrate_allocator) { + *bitrate_allocator = CreateBitrateAllocator(*codec); + } return true; }