zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated version of VideoCodecInitializer::SetupCodec.

Browse Source 
Bug: webrtc:8830
Change-Id: I0345e2a8c4db022fe8e0d2594f4b50101c37940b
Reviewed-on: https://webrtc-review.googlesource.com/65500
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22783}
This commit is contained in:
Niels Möller
2018-04-06 13:07:01 +02:00
committed by Commit Bot
parent e3b5b6e50b
commit b46d1b8aea
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/video_coding/include/video_codec_initializer.h
View File

@ -13,11 +13,9 @@
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "call/video_config.h"
#include "call/video_send_stream.h"
namespace webrtc {
@ -27,8 +25,8 @@ class VideoEncoderConfig;
class VideoCodecInitializer {
public:
// Takes an EncoderSettings, a VideoEncoderConfig and the VideoStream
// configuration and translated them into the old school VideoCodec type.
// Takes a VideoEncoderConfig and the VideoStream configuration and
// translates them into the old school VideoCodec type.
// It also creates a VideoBitrateAllocator instance, suitable for the codec
// type used. For instance, VP8 will create an allocator than can handle
// simulcast and temporal layering.
@ -40,20 +38,6 @@ class VideoCodecInitializer {
VideoCodec* codec,
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator);
// TODO(nisse): Deprecated version, with an additional ignored argument.
// Delete as soon as downstream users are updated, together with above
// includes of "call/video_send_stream.h" and <utility>.
static bool SetupCodec(
const VideoEncoderConfig& config,
const VideoSendStream::Config::EncoderSettings /* settings */,
const std::vector<VideoStream>& streams,
bool nack_enabled,
VideoCodec* codec,
std::unique_ptr<VideoBitrateAllocator>* bitrate_allocator) {
return SetupCodec(config, streams, nack_enabled, codec,
std::move(bitrate_allocator));
}
// Create a bitrate allocator for the specified codec. |tl_factory| is
// optional, if it is populated, ownership of that instance will be
// transferred to the VideoBitrateAllocator instance.