Remove VCMPacketizationCallback

webrtc/video/vie_encoder.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_VIDEO_VIE_ENCODER_H_
 #define WEBRTC_VIDEO_VIE_ENCODER_H_
 
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/video_encoder.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
@@ skipping 20 matching lines @@
 // Usage:
 // 1. Instantiate
 // 2. Call Init
 // 3. Call RegisterExternalEncoder if available.
 // 4. Call SetEncoder with the codec settings and the object that shall receive
 //    the encoded bit stream.
 // 5. Call Start.
 // 6. For each available raw video frame call EncodeVideoFrame.
 class ViEEncoder : public VideoEncoderRateObserver,
                    public EncodedImageCallback,
-                   public VCMPacketizationCallback,
                    public VCMSendStatisticsCallback {
  public:
   friend class ViEBitrateObserver;
 
   ViEEncoder(uint32_t number_of_cores,
              const std::vector<uint32_t>& ssrcs,
              ProcessThread* module_process_thread,
              SendStatisticsProxy* stats_proxy,
              // TODO(nisse): Used only for tests, delete?
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
              OveruseFrameDetector* overuse_detector,
              PacedSender* pacer);
   ~ViEEncoder();
 
-  bool Init();
-
   vcm::VideoSender* video_sender();
 
   void SetNetworkTransmissionState(bool is_transmitting);
 
   // Returns the id of the owning channel.
   int Owner() const;
 
   void Start();
   // Drops incoming packets before they get to the encoder.
   void Pause();
@@ skipping 13 matching lines @@
 
   uint32_t LastObservedBitrateBps() const;
   // Loss protection. Must be called before SetEncoder() to have max packet size
   // updated according to protection.
   // TODO(pbos): Set protection method on construction.
   void SetProtectionMethod(bool nack, bool fec);
 
   // Implements VideoEncoderRateObserver.
   void OnSetRates(uint32_t bitrate_bps, int framerate) override;
 
-  // Implements VCMPacketizationCallback.
-  void OnEncoderImplementationName(const char* implementation_name) override;
-
   // Implements EncodedImageCallback.
   int32_t Encoded(const EncodedImage& encoded_image,
                   const CodecSpecificInfo* codec_specific_info,
                   const RTPFragmentationHeader* fragmentation) override;
 
   // Implements VideoSendStatisticsCallback.
-  int32_t SendStatistics(const uint32_t bit_rate,
-                         const uint32_t frame_rate) override;
+  void SendStatistics(uint32_t bit_rate,
+                      uint32_t frame_rate,
+                      const std::string& encoder_name) override;
 
   // virtual to test EncoderStateFeedback with mocks.
   virtual void OnReceivedIntraFrameRequest(uint32_t ssrc);
   virtual void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id);
   virtual void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id);
 
   int GetPaddingNeededBps() const;
 
   void OnBitrateUpdated(uint32_t bitrate_bps,
                         uint8_t fraction_lost,
@@ skipping 44 matching lines @@
   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
 
   bool video_suspended_ GUARDED_BY(data_cs_);
 
   std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers] GUARDED_BY(data_cs_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_