Wire up FlexFEC in VideoEngine2.

webrtc/media/engine/webrtcvideoengine2.h

Index: webrtc/media/engine/webrtcvideoengine2.h
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
index 546799ec88b0ba8344613929042e0408b972a5e3..fe6024dd718d3cf1777e593a9e8334908d2fc858 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -194,6 +194,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
 
     VideoCodec codec;
     webrtc::UlpfecConfig ulpfec;
+    webrtc::FlexfecConfig flexfec;
     int rtx_payload_type;
   };
 
@@ -220,6 +221,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
   void SetMaxSendBandwidth(int bps);
 
   void ConfigureReceiverRtp(webrtc::VideoReceiveStream::Config* config,
+                            webrtc::FlexfecConfig* flexfec_config,
                             const StreamParams& sp) const;
   bool ValidateSendSsrcAvailability(const StreamParams& sp) const
       EXCLUSIVE_LOCKS_REQUIRED(stream_crit_);
@@ -383,7 +385,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
         webrtc::VideoReceiveStream::Config config,
         WebRtcVideoDecoderFactory* external_decoder_factory,
         bool default_stream,
-        const std::vector<VideoCodecSettings>& recv_codecs);
+        const std::vector<VideoCodecSettings>& recv_codecs,
+        const webrtc::FlexfecConfig& flexfec_config);
     ~WebRtcVideoReceiveStream();
 
     const std::vector<uint32_t>& GetSsrcs() const;
@@ -430,9 +433,12 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
     webrtc::Call* const call_;
     StreamParams stream_params_;
 
+    // Both |stream_| and |flexfec_stream_| are owned by |this|.

[magjed_webrtc, 2016/11/21 13:55:13]

I'm still slightly confused, because |call_| actually owns these so that's why
we can't put them into unique_ptrs. Can you clarify even more, something like:
Both |stream_| and |flexfec_stream_| are managed by |this|, and are destroyed by
calling call_->DestroyVideoReceiveStream and call_->DestroyFlexfecReceiveStream
respectively.

[brandtr, 2016/11/21 16:03:47]

My original thinking was that the caller owns the streams, not Call, since it is
up to the caller to decide when the streams should be created and destroyed.
During the method calls, the ownership is then temporarily moved between the
caller and Call through the raw pointers. But this thinking breaks down with
your suggested implementation of the Create/Destroy methods. So I think your
suggested comment takes makes sense here.

     webrtc::VideoReceiveStream* stream_;
     const bool default_stream_;
     webrtc::VideoReceiveStream::Config config_;
+    webrtc::FlexfecConfig flexfec_config_;
+    webrtc::FlexfecReceiveStream* flexfec_stream_;
 
     WebRtcVideoDecoderFactory* const external_decoder_factory_;
     std::vector<AllocatedDecoder> allocated_decoders_;