Clean away use of RtpAudioFeedback interface from RTP/RTCP sender code.

webrtc/voice_engine/channel.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.
  */
 
@@ skipping 138 matching lines @@
   rtc::CriticalSection lock_;
   State state_;
 };
 
 class Channel
     : public RtpData,
       public RtpFeedback,
       public FileCallback,  // receiving notification from file player &
                             // recorder
       public Transport,
-      public RtpAudioFeedback,
       public AudioPacketizationCallback,  // receive encoded packets from the
                                           // ACM
       public ACMVADCallback,              // receive voice activity from the ACM
       public MixerParticipant  // supplies output mixer with audio frames
 {
  public:
   friend class VoERtcpObserver;
 
   enum { KNumSocketThreads = 1 };
   enum { KNumberOfSocketBuffers = 8 };
@@ skipping 208 matching lines @@
 
   // From RtpFeedback in the RTP/RTCP module
   int32_t OnInitializeDecoder(int8_t payloadType,
                               const char payloadName[RTP_PAYLOAD_NAME_SIZE],
                               int frequency,
                               size_t channels,
                               uint32_t rate) override;
   void OnIncomingSSRCChanged(uint32_t ssrc) override;
   void OnIncomingCSRCChanged(uint32_t CSRC, bool added) override;
 
-  // From RtpAudioFeedback in the RTP/RTCP module
-  void OnPlayTelephoneEvent(uint8_t event,
-                            uint16_t lengthMs,
-                            uint8_t volume) override;
-
   // From Transport (called by the RTP/RTCP module)
   bool SendRtp(const uint8_t* data,
                size_t len,
                const PacketOptions& packet_options) override;
   bool SendRtcp(const uint8_t* data, size_t len) override;
 
   // From MixerParticipant
   int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override;
   int32_t NeededFrequency(int32_t id) const override;
 
@@ skipping 170 matching lines @@
   PacketRouter* packet_router_ = nullptr;
   std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
   std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
   std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
 };
 
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_H_