Use vcm::VideoReceiver on the receive side.

webrtc/modules/video_coding/video_coding_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 55 matching lines @@
 
  private:
   std::unique_ptr<CriticalSectionWrapper> cs_;
   EncodedImageCallback* callback_ GUARDED_BY(cs_);
 };
 
 class VideoCodingModuleImpl : public VideoCodingModule {
  public:
   VideoCodingModuleImpl(Clock* clock,
                         EventFactory* event_factory,
-                        bool owns_event_factory,
                         VideoEncoderRateObserver* encoder_rate_observer,
                         VCMQMSettingsCallback* qm_settings_callback,
                         NackSender* nack_sender,
                         KeyFrameRequestSender* keyframe_request_sender,
                         EncodedImageCallback* pre_decode_image_callback)
       : VideoCodingModule(),
         sender_(clock,
                 &post_encode_callback_,
                 encoder_rate_observer,
                 qm_settings_callback),
         receiver_(clock,
                   event_factory,
                   pre_decode_image_callback,
                   nack_sender,
-                  keyframe_request_sender),
-        own_event_factory_(owns_event_factory ? event_factory : NULL) {}
+                  keyframe_request_sender) {}
 
-  virtual ~VideoCodingModuleImpl() { own_event_factory_.reset(); }
+  virtual ~VideoCodingModuleImpl() {}
 
   int64_t TimeUntilNextProcess() override {
     int64_t sender_time = sender_.TimeUntilNextProcess();
     int64_t receiver_time = receiver_.TimeUntilNextProcess();
     assert(sender_time >= 0);
     assert(receiver_time >= 0);
     return VCM_MIN(sender_time, receiver_time);
   }
 
   void Process() override {
@@ skipping 174 matching lines @@
       EncodedImageCallback* observer) override {
     post_encode_callback_.Register(observer);
   }
 
   void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); }
 
  private:
   EncodedImageCallbackWrapper post_encode_callback_;
   vcm::VideoSender sender_;
   vcm::VideoReceiver receiver_;
-  std::unique_ptr<EventFactory> own_event_factory_;
 };
 }  // namespace
 
 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
   VCMCodecDataBase::Codec(codecType, codec);
 }
 
 // Create method for current interface, will be removed when the
 // new jitter buffer is in place.
 VideoCodingModule* VideoCodingModule::Create(
     Clock* clock,
     VideoEncoderRateObserver* encoder_rate_observer,
     VCMQMSettingsCallback* qm_settings_callback) {
   return VideoCodingModule::Create(clock, encoder_rate_observer,
                                    qm_settings_callback,
                                    nullptr,   // NackSender
                                    nullptr,   // KeyframeRequestSender
                                    nullptr);  // Pre-decode image callback
 }
 
 // Create method for the new jitter buffer.
 VideoCodingModule* VideoCodingModule::Create(
     Clock* clock,
     VideoEncoderRateObserver* encoder_rate_observer,
     VCMQMSettingsCallback* qm_settings_callback,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender,
     EncodedImageCallback* pre_decode_image_callback) {
-  return new VideoCodingModuleImpl(clock, new EventFactoryImpl, true,
-                                   encoder_rate_observer, qm_settings_callback,
-                                   nack_sender, keyframe_request_sender,
-                                   pre_decode_image_callback);
+  return new VideoCodingModuleImpl(
+      clock, nullptr, encoder_rate_observer, qm_settings_callback, nack_sender,
+      keyframe_request_sender, pre_decode_image_callback);
 }
 
 // Create method for current interface, will be removed when the
 // new jitter buffer is in place.
 VideoCodingModule* VideoCodingModule::Create(Clock* clock,
                                              EventFactory* event_factory) {
   return VideoCodingModule::Create(clock, event_factory,
                                    nullptr,   // NackSender
                                    nullptr);  // KeyframeRequestSender
 }
 
 // Create method for the new jitter buffer.
 VideoCodingModule* VideoCodingModule::Create(
     Clock* clock,
     EventFactory* event_factory,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender) {
   assert(clock);
   assert(event_factory);
-  return new VideoCodingModuleImpl(clock, event_factory, false, nullptr,
-                                   nullptr, nack_sender,
-                                   keyframe_request_sender, nullptr);
+  return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr,
+                                   nack_sender, keyframe_request_sender,
+                                   nullptr);
 }
 
 }  // namespace webrtc