Replace AudioReceiveStream::DeliverRtp with OnRtpPacket.

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 35 matching lines @@
 class FileWrapper;
 class PacketRouter;
 class ProcessThread;
 class RateLimiter;
 class ReceiveStatistics;
 class RemoteNtpTimeEstimator;
 class RtcEventLog;
 class RTPPayloadRegistry;
 class RtpReceiver;
 class RTPReceiverAudio;
+class RtpPacketReceived;
 class RtpRtcp;
 class TelephoneEventHandler;
 class VoERTPObserver;
 class VoiceEngineObserver;
 
 struct CallStatistics;
 struct ReportBlock;
 struct SenderInfo;
 
 namespace voe {
@@ skipping 131 matching lines @@
   void DisableAudioNetworkAdaptor();
   void SetReceiverFrameLengthRange(int min_frame_length_ms,
                                    int max_frame_length_ms);
 
   // VoENetwork
   int32_t RegisterExternalTransport(Transport* transport);
   int32_t DeRegisterExternalTransport();
   int32_t ReceivedRTPPacket(const uint8_t* received_packet,
                             size_t length,
                             const PacketTime& packet_time);
+  // TODO(nisse, solenberg): Delete when VoENetwork is deleted.
   int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length);
+  void OnRtpPacket(const RtpPacketReceived& packet);
 
   // VoEFile
   int StartPlayingFileLocally(const char* fileName,
                               bool loop,
                               FileFormats format,
                               int startPosition,
                               float volumeScaling,
                               int stopPosition,
                               const CodecInst* codecInst);
   int StartPlayingFileLocally(InStream* stream,
@@ skipping 173 matching lines @@
   void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
   void SetTransportOverhead(size_t transport_overhead_per_packet);
 
   // From OverheadObserver in the RTP/RTCP module
   void OnOverheadChanged(size_t overhead_bytes_per_packet) override;
 
  protected:
   void OnIncomingFractionLoss(int fraction_lost);
 
  private:
+  bool OnRtpPacketWithHeader(const uint8_t* received_packet,
+                             size_t length,
+                             RTPHeader *header);
   bool ReceivePacket(const uint8_t* packet,
                      size_t packet_length,
                      const RTPHeader& header,
                      bool in_order);
   bool HandleRtxPacket(const uint8_t* packet,
                        size_t packet_length,
                        const RTPHeader& header);
   bool IsPacketInOrder(const RTPHeader& header) const;
   bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
   int ResendPackets(const uint16_t* sequence_numbers, int length);
@@ skipping 109 matching lines @@
   std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
 
   // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
 };
 
 }  // namespace voe
 }  // namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_CHANNEL_H_