Delete RtpData::OnRecoveredPacket, use RecoveredPacketReceiver instead.

webrtc/video/rtp_stream_receiver.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 38 matching lines @@
 class RtpReceiver;
 class Transport;
 class UlpfecReceiver;
 class VCMTiming;
 
 namespace vcm {
 class VideoReceiver;
 }  // namespace vcm
 
 class RtpStreamReceiver : public RtpData,
+                          public RecoveredPacketReceiver,
                           public RtpFeedback,
                           public VCMFrameTypeCallback,
                           public VCMPacketRequestCallback,
                           public video_coding::OnReceivedFrameCallback,
                           public video_coding::OnCompleteFrameCallback,
                           public CallStatsObserver {
  public:
   RtpStreamReceiver(
       Transport* transport,
       RtcpRttStats* rtt_stats,
@@ skipping 26 matching lines @@
 
   void SignalNetworkState(NetworkState state);
 
   // TODO(nisse): Intended to be part of an RtpPacketReceiver interface.
   void OnRtpPacket(const RtpPacketReceived& packet);
 
   // Implements RtpData.
   int32_t OnReceivedPayloadData(const uint8_t* payload_data,
                                 size_t payload_size,
                                 const WebRtcRTPHeader* rtp_header) override;
-  bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
+  // Implements RecoveredPacketReceiver.
+  void OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
 
   // Implements RtpFeedback.
   int32_t OnInitializeDecoder(int8_t payload_type,
                               const char payload_name[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 {}
 
@@ skipping 17 matching lines @@
   void OnCompleteFrame(
       std::unique_ptr<video_coding::FrameObject> frame) override;
 
   void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
 
   rtc::Optional<int64_t> LastReceivedPacketMs() const;
   rtc::Optional<int64_t> LastReceivedKeyframePacketMs() const;
 
  private:
   bool AddReceiveCodec(const VideoCodec& video_codec);
-  bool ReceivePacket(const uint8_t* packet,
+  void ReceivePacket(const uint8_t* packet,
                      size_t packet_length,
                      const RTPHeader& header,
                      bool in_order);
   // Parses and handles for instance RTX and RED headers.
   // This function assumes that it's being called from only one thread.
-  bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
+  void ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
                                          size_t packet_length,
                                          const RTPHeader& header);
   void NotifyReceiverOfFecPacket(const RTPHeader& header);
   bool IsPacketInOrder(const RTPHeader& header) const;
   bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
   void UpdateHistograms();
   void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
   bool IsRedEnabled() const;
   void InsertSpsPpsIntoTracker(uint8_t payload_type);
 
@@ skipping 35 matching lines @@
   // Maps a payload type to a map of out-of-band supplied codec parameters.
   std::map<uint8_t, std::map<std::string, std::string>> pt_codec_params_;
   int16_t last_payload_type_ = -1;
 
   bool has_received_frame_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_