Remove callback_cs_ in ViEEncoder.

webrtc/video/send_statistics_proxy.h

 /*
  *  Copyright (c) 2013 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 15 matching lines @@
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 
 class SendStatisticsProxy : public CpuOveruseMetricsObserver,
                             public RtcpStatisticsCallback,
                             public RtcpPacketTypeCounterObserver,
                             public StreamDataCountersCallback,
                             public BitrateStatisticsObserver,
                             public FrameCountObserver,
-                            public ViEEncoderObserver,
                             public VideoEncoderRateObserver,
                             public SendSideDelayObserver {
  public:
   static const int kStatsTimeoutMs;
 
   SendStatisticsProxy(Clock* clock, const VideoSendStream::Config& config);
   virtual ~SendStatisticsProxy();
 
   VideoSendStream::Stats GetStats();
 
   virtual void OnSendEncodedImage(const EncodedImage& encoded_image,
                                   const RTPVideoHeader* rtp_video_header);
   // Used to update incoming frame rate.
   void OnIncomingFrame(int width, int height);
 
   // Used to update encode time of frames.
   void OnEncodedFrame(int encode_time_ms);
 
   // From VideoEncoderRateObserver.
   void OnSetRates(uint32_t bitrate_bps, int framerate) override;
 
+  void OnOutgoingRate(uint32_t framerate, uint32_t bitrate);
+  void OnSuspendChange(bool is_suspended);
   void OnInactiveSsrc(uint32_t ssrc);
 
  protected:
   // From CpuOveruseMetricsObserver.
   void CpuOveruseMetricsUpdated(const CpuOveruseMetrics& metrics) override;
   // From RtcpStatisticsCallback.
   void StatisticsUpdated(const RtcpStatistics& statistics,
                          uint32_t ssrc) override;
   void CNameChanged(const char* cname, uint32_t ssrc) override;
   // From RtcpPacketTypeCounterObserver.
   void RtcpPacketTypesCounterUpdated(
       uint32_t ssrc,
       const RtcpPacketTypeCounter& packet_counter) override;
   // From StreamDataCountersCallback.
   void DataCountersUpdated(const StreamDataCounters& counters,
                            uint32_t ssrc) override;
 
   // From BitrateStatisticsObserver.
   void Notify(const BitrateStatistics& total_stats,
               const BitrateStatistics& retransmit_stats,
               uint32_t ssrc) override;
 
   // From FrameCountObserver.
   void FrameCountUpdated(const FrameCounts& frame_counts,
                          uint32_t ssrc) override;
 
-  // From ViEEncoderObserver.
-  void OutgoingRate(const int video_channel,
-                    const unsigned int framerate,
-                    const unsigned int bitrate) override;
-
-  void SuspendChange(int video_channel, bool is_suspended) override;
-
   void SendSideDelayUpdated(int avg_delay_ms,
                             int max_delay_ms,
                             uint32_t ssrc) override;
 
  private:
   struct SampleCounter {
     SampleCounter() : sum(0), num_samples(0) {}
     void Add(int sample);
     int Avg(int min_required_samples) const;
 
@@ skipping 24 matching lines @@
   int max_sent_height_per_timestamp_ GUARDED_BY(crit_);
   SampleCounter input_width_counter_ GUARDED_BY(crit_);
   SampleCounter input_height_counter_ GUARDED_BY(crit_);
   SampleCounter sent_width_counter_ GUARDED_BY(crit_);
   SampleCounter sent_height_counter_ GUARDED_BY(crit_);
   SampleCounter encode_time_counter_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_