Add path for recovered packets from internal::Call to RtpStreamReceiver.

webrtc/video/video_receive_stream.h

 /*
  *  Copyright (c) 2013 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_VIDEO_RECEIVE_STREAM_H_
 #define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/call.h"
 #include "webrtc/call/transport_adapter.h"
 #include "webrtc/common_video/include/incoming_video_stream.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/video/receive_statistics_proxy.h"
 #include "webrtc/video/rtp_stream_receiver.h"
 #include "webrtc/video/rtp_streams_synchronizer.h"
 #include "webrtc/video/video_stream_decoder.h"
 #include "webrtc/video_receive_stream.h"
 
 namespace webrtc {
 
 class CallStats;
 class CongestionController;
 class IvfFileWriter;
 class ProcessThread;
 class RTPFragmentationHeader;
 class VoiceEngine;
 class VieRemb;
 
 namespace internal {
 
 class VideoReceiveStream : public webrtc::VideoReceiveStream,
                            public rtc::VideoSinkInterface<VideoFrame>,
                            public EncodedImageCallback,
                            public NackSender,
-                           public KeyFrameRequestSender {
+                           public KeyFrameRequestSender,
+                           public RecoveredPacketReceiver {

[stefan-webrtc, 2016/10/10 15:42:02]

It's not really necessary for this to implement RecoveredPacketReceiver. Maybe
we should not?

[brandtr, 2016/10/10 23:05:19]

You are absolutely right. It doesn't really make sense for this class to
implement that interface, since my (previously undocumented) intention with the
interface is that the implementation demultiplexes the recovered packet based on
SSRC. And this class can't do that...

  public:
   VideoReceiveStream(int num_cpu_cores,
                      CongestionController* congestion_controller,
                      VideoReceiveStream::Config config,
                      webrtc::VoiceEngine* voice_engine,
                      ProcessThread* process_thread,
                      CallStats* call_stats,
                      VieRemb* remb);
   ~VideoReceiveStream() override;
 
   void SignalNetworkState(NetworkState state);
   bool DeliverRtcp(const uint8_t* packet, size_t length);
   bool DeliverRtp(const uint8_t* packet,
                   size_t length,
                   const PacketTime& packet_time);
 
+  // Implements RecoveredPacketReceiver.
+  bool OnRecoveredPacket(const uint8_t* packet, size_t length) override;
+
   // webrtc::VideoReceiveStream implementation.
   void Start() override;
   void Stop() override;
 
   webrtc::VideoReceiveStream::Stats GetStats() const override;
 
   // Overrides rtc::VideoSinkInterface<VideoFrame>.
   void OnFrame(const VideoFrame& video_frame) override;
 
   // Overrides EncodedImageCallback.
@@ skipping 41 matching lines @@
   std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
   RtpStreamsSynchronizer rtp_stream_sync_;
 
   rtc::CriticalSection ivf_writer_lock_;
   std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_