Remove callback_cs_ in ViEEncoder.

webrtc/video_engine/vie_channel_group.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_ENGINE_VIE_CHANNEL_GROUP_H_
 #define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 
 namespace webrtc {
 
 class BitrateAllocator;
 class CallStats;
 class Config;
 class EncoderStateFeedback;
+class I420FrameCallback;
 class PacedSender;
 class PacketRouter;
 class ProcessThread;
 class RemoteBitrateEstimator;
+class SendStatisticsProxy;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
 class VoEVideoSync;
 
 typedef std::list<ViEChannel*> ChannelList;
 
 // Channel group contains data common for several channels. All channels in the
 // group are assumed to send/receive data to the same end-point.
 class ChannelGroup : public BitrateObserver {
  public:
   explicit ChannelGroup(ProcessThread* process_thread);
   ~ChannelGroup();
   bool CreateSendChannel(int channel_id,
                          Transport* transport,
+                         SendStatisticsProxy* stats_proxy,
+                         I420FrameCallback* pre_encode_callback,
                          int number_of_cores,
                          const std::vector<uint32_t>& ssrcs);
   bool CreateReceiveChannel(int channel_id,
                             Transport* transport,
                             int number_of_cores);
   void DeleteChannel(int channel_id);
   ViEChannel* GetChannel(int channel_id) const;
   ViEEncoder* GetEncoder(int channel_id) const;
   void SetSyncInterface(VoEVideoSync* sync_interface);
 
@@ skipping 37 matching lines @@
   // Registered at construct time and assumed to outlive this class.
   ProcessThread* const process_thread_;
   rtc::scoped_ptr<ProcessThread> pacer_thread_;
 
   rtc::scoped_ptr<BitrateController> bitrate_controller_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_