Replace RtpStreamReceiver::DeliverRtp with OnRtpPacket.

webrtc/video/rtp_stream_receiver.h

Index: webrtc/video/rtp_stream_receiver.h
diff --git a/webrtc/video/rtp_stream_receiver.h b/webrtc/video/rtp_stream_receiver.h
index dd217899f2d7914361ae8488115cce69ccf67089..ad7bcfab7d66e54d40764728c51035ec5d6fc502 100644
--- a/webrtc/video/rtp_stream_receiver.h
+++ b/webrtc/video/rtp_stream_receiver.h
@@ -44,6 +44,7 @@ class ReceiveStatisticsProxy;
 class RemoteNtpTimeEstimator;
 class RtcpRttStats;
 class RtpHeaderParser;
+class RtpPacketReceived;
 class RTPPayloadRegistry;
 class RtpReceiver;
 class Transport;
@@ -89,9 +90,6 @@ class RtpStreamReceiver : public RtpData,
   void StartReceive();
   void StopReceive();
 
-  bool DeliverRtp(const uint8_t* rtp_packet,
-                  size_t rtp_packet_length,
-                  const PacketTime& packet_time);
   bool DeliverRtcp(const uint8_t* rtcp_packet, size_t rtcp_packet_length);
 
   void FrameContinuous(uint16_t seq_num);
@@ -100,6 +98,9 @@ class RtpStreamReceiver : public RtpData,
 
   void SignalNetworkState(NetworkState state);
 
+  // TODO(nisse): Intended to be part of an RtpPacketReceiver interface.
+  bool OnRtpPacket(const RtpPacketReceived& packet);

[nisse-webrtc, 2017/02/10 11:56:27]

I wonder, do we really need a return value? When can it return false, and is
anyone caring about the return value? E.g., WebRtcVideoChannel2 ignores
DELIVERY_PACKET_ERROR anyway, see

https://cs.chromium.org/chromium/src/third_party/webrtc/media/engine/webrtcvi...

[nisse-webrtc, 2017/02/10 12:47:51]

I went ahead and deleted the return type. Both video engine and voice engine
call DeliverPacket and only check for the DELIVERY_UNKNOWN_SSRC return status.
Then make no distinction between DELIVERY_OK and DELIVERY_PACKET_ERROR.

+
   // Implements RtpData.
   int32_t OnReceivedPayloadData(const uint8_t* payload_data,
                                 size_t payload_size,