From c4e9825c04010dabbb9de319cc37862d2e730107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 8 Nov 2018 13:08:26 +0100 Subject: [PATCH] Delete classes EventFactory and EventFactoryImpl. Followup to cl https://webrtc-review.googlesource.com/c/src/+/107890 Bug: webrtc:3380 Change-Id: Iac4389186be3ffbc55e53e18aa302465cd771da4 Reviewed-on: https://webrtc-review.googlesource.com/c/110140 Reviewed-by: Philip Eliasson Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#25559} --- modules/video_coding/include/video_coding.h | 20 -------------------- modules/video_coding/video_coding_impl.cc | 7 +------ 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/modules/video_coding/include/video_coding.h b/modules/video_coding/include/video_coding.h index 5f21ca3908..0889b231de 100644 --- a/modules/video_coding/include/video_coding.h +++ b/modules/video_coding/include/video_coding.h @@ -38,21 +38,6 @@ class VideoDecoder; class VideoEncoder; struct CodecSpecificInfo; -// DEPRECATED -class EventFactory { - public: - virtual ~EventFactory() {} - - virtual EventWrapper* CreateEvent() = 0; -}; - -class RTC_DEPRECATED EventFactoryImpl : public EventFactory { - public: - ~EventFactoryImpl() override {} - - EventWrapper* CreateEvent() override; -}; - // Used to indicate which decode with errors mode should be used. enum VCMDecodeErrorMode { kNoErrors, // Never decode with errors. Video will freeze @@ -70,11 +55,6 @@ class VideoCodingModule : public Module { public: enum SenderNackMode { kNackNone, kNackAll, kNackSelective }; - RTC_DEPRECATED - static VideoCodingModule* Create(Clock* clock, - EventFactory* /* event_factory*/) { - return Create(clock); - } // DEPRECATED. static VideoCodingModule* Create(Clock* clock); diff --git a/modules/video_coding/video_coding_impl.cc b/modules/video_coding/video_coding_impl.cc index a6e8e836c9..17481bcd13 100644 --- a/modules/video_coding/video_coding_impl.cc +++ b/modules/video_coding/video_coding_impl.cc @@ -27,10 +27,6 @@ #include "system_wrappers/include/clock.h" namespace webrtc { -EventWrapper* EventFactoryImpl::CreateEvent() { - return EventWrapper::Create(); -} - namespace vcm { int64_t VCMProcessTimer::Period() const { @@ -81,7 +77,6 @@ class EncodedImageCallbackWrapper : public EncodedImageCallback { class VideoCodingModuleImpl : public VideoCodingModule { public: VideoCodingModuleImpl(Clock* clock, - EventFactory* /* event_factory */, NackSender* nack_sender, KeyFrameRequestSender* keyframe_request_sender) : VideoCodingModule(), @@ -219,7 +214,7 @@ class VideoCodingModuleImpl : public VideoCodingModule { // new jitter buffer is in place. VideoCodingModule* VideoCodingModule::Create(Clock* clock) { RTC_DCHECK(clock); - return new VideoCodingModuleImpl(clock, nullptr, nullptr, nullptr); + return new VideoCodingModuleImpl(clock, nullptr, nullptr); } } // namespace webrtc