Add |protected_by_flexfec| flag to VideoReceiveStream::Config.

webrtc/video/video_receive_stream.cc

 /*
  *  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.
  */
 
@@ skipping 156 matching lines @@
       kDefaultStartBitrate;
 
   return codec;
 }
 }  // namespace
 
 namespace internal {
 
 VideoReceiveStream::VideoReceiveStream(
     int num_cpu_cores,
-    bool protected_by_flexfec,
     PacketRouter* packet_router,
     VideoReceiveStream::Config config,
     ProcessThread* process_thread,
     CallStats* call_stats,
     VieRemb* remb)
     : transport_adapter_(config.rtcp_send_transport),
       config_(std::move(config)),
       num_cpu_cores_(num_cpu_cores),
-      protected_by_flexfec_(protected_by_flexfec),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
       decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
       call_stats_(call_stats),
       timing_(new VCMTiming(clock_)),
       video_receiver_(clock_, nullptr, this, timing_.get(), this, this),
       stats_proxy_(&config_, clock_),
       rtp_stream_receiver_(&video_receiver_,
                            &transport_adapter_,
                            call_stats_->rtcp_rtt_stats(),
@@ skipping 71 matching lines @@
 void VideoReceiveStream::SetSync(Syncable* audio_syncable) {
   RTC_DCHECK_RUN_ON(&worker_thread_checker_);
   rtp_stream_sync_.ConfigureSync(audio_syncable);
 }
 
 void VideoReceiveStream::Start() {
   RTC_DCHECK_RUN_ON(&worker_thread_checker_);
   if (decode_thread_.IsRunning())
     return;
 
-  bool protected_by_fec =
-      protected_by_flexfec_ || rtp_stream_receiver_.IsUlpfecEnabled();
+  bool protected_by_fec = config_.rtp.protected_by_flexfec ||
+                          rtp_stream_receiver_.IsUlpfecEnabled();
 
   if (jitter_buffer_experiment_) {
     frame_buffer_->Start();
     call_stats_->RegisterStatsObserver(&rtp_stream_receiver_);
 
     if (rtp_stream_receiver_.IsRetransmissionsEnabled() && protected_by_fec) {
       frame_buffer_->SetProtectionMode(kProtectionNackFEC);
     }
   }
   transport_adapter_.Enable();
@@ skipping 209 matching lines @@
       LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
                       << " ms, requesting keyframe.";
       RequestKeyFrame();
     }
   } else {
     video_receiver_.Decode(kMaxDecodeWaitTimeMs);
   }
 }
 }  // namespace internal
 }  // namespace webrtc