From c334ce978c3e5b130955de8e3db43377ba36c287 Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Mon, 5 Feb 2018 13:03:25 +0100 Subject: [PATCH] Remove legacy ctor from SimulcastEncoderAdapter. Bug: None Change-Id: I9c1472c2aef0133816466916e26378466510054a Reviewed-on: https://webrtc-review.googlesource.com/47880 Reviewed-by: Magnus Jedvert Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#21947} --- media/engine/simulcast_encoder_adapter.cc | 19 ++----------------- media/engine/simulcast_encoder_adapter.h | 3 --- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc index ea54e66293..4b3fb3c40c 100644 --- a/media/engine/simulcast_encoder_adapter.cc +++ b/media/engine/simulcast_encoder_adapter.cc @@ -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); diff --git a/media/engine/simulcast_encoder_adapter.h b/media/engine/simulcast_encoder_adapter.h index 9650cd39a8..240a621134 100644 --- a/media/engine/simulcast_encoder_adapter.h +++ b/media/engine/simulcast_encoder_adapter.h @@ -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 streaminfos_; EncodedImageCallback* encoded_complete_callback_;