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

Remove legacy ctor from SimulcastEncoderAdapter.

Browse Source 
Bug: None
Change-Id: I9c1472c2aef0133816466916e26378466510054a
Reviewed-on: https://webrtc-review.googlesource.com/47880
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21947}
This commit is contained in:
Rasmus Brandt 2018-02-05 13:03:25 +01:00 committed by Commit Bot
parent e4275901fe
commit c334ce978c
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
media/engine/simulcast_encoder_adapter.cc
View File

@ -137,23 +137,10 @@ namespace webrtc {
SimulcastEncoderAdapter::SimulcastEncoderAdapter(VideoEncoderFactory* factory)
: inited_(0),
factory_(factory),
cricket_factory_(nullptr),
encoded_complete_callback_(nullptr),
implementation_name_("SimulcastEncoderAdapter") {
// The adapter is typically created on the worker thread, but operated on
// the encoder task queue.
encoder_queue_.Detach();
RTC_DCHECK(factory_);
memset(&codec_, 0, sizeof(webrtc::VideoCodec));
}
SimulcastEncoderAdapter::SimulcastEncoderAdapter(
cricket::WebRtcVideoEncoderFactory* factory)
: inited_(0),
factory_(nullptr),
cricket_factory_(factory),
encoded_complete_callback_(nullptr),
implementation_name_("SimulcastEncoderAdapter") {
// The adapter is typically created on the worker thread, but operated on
// the encoder task queue.
encoder_queue_.Detach();
@ -260,9 +247,7 @@ int SimulcastEncoderAdapter::InitEncode(const VideoCodec* inst,
encoder = std::move(stored_encoders_.top());
stored_encoders_.pop();
} else {
encoder = factory_ ? factory_->CreateVideoEncoder(SdpVideoFormat("VP8"))
: CreateScopedVideoEncoder(cricket_factory_,
cricket::VideoCodec("VP8"));
encoder = factory_->CreateVideoEncoder(SdpVideoFormat("VP8"));
}
ret = encoder->InitEncode(&stream_codec, number_of_cores, max_payload_size);

3
media/engine/simulcast_encoder_adapter.h
View File

@ -35,8 +35,6 @@ class VideoEncoderFactory;
class SimulcastEncoderAdapter : public VP8Encoder {
public:
explicit SimulcastEncoderAdapter(VideoEncoderFactory* factory);
// Deprecated - use webrtc::VideoEncoderFactory instead.
explicit SimulcastEncoderAdapter(cricket::WebRtcVideoEncoderFactory* factory);
virtual ~SimulcastEncoderAdapter();
// Implements VideoEncoder.
@ -100,7 +98,6 @@ class SimulcastEncoderAdapter : public VP8Encoder {
volatile int inited_; // Accessed atomically.
VideoEncoderFactory* const factory_;
cricket::WebRtcVideoEncoderFactory* const cricket_factory_;
VideoCodec codec_;
std::vector<StreamInfo> streaminfos_;
EncodedImageCallback* encoded_complete_callback_;