Delete member VideoReceiveStream::Config::Rtp::ulpfec.

media/engine/webrtcvideoengine.cc

 /*
  *  Copyright (c) 2014 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 2245 matching lines @@
     config_.rtp.rtx_associated_payload_types[recv_codec.rtx_payload_type] =
         recv_codec.codec.id;
 
     const bool did_insert =
         allocated_decoders_
             .insert(std::make_pair(video_format, std::move(new_decoder)))
             .second;
     RTC_CHECK(did_insert);
   }
 
-  config_.rtp.ulpfec = recv_codecs.front().ulpfec;
+  config_.rtp.ulpfec_payload_type =
+      recv_codecs.front().ulpfec.ulpfec_payload_type;

[brandtr, 2017/09/21 08:11:33]

Maybe nicer to keep a const ref to |recv_codecs.front()|, as you use it four
times?

[nisse-webrtc, 2017/09/21 08:37:46]

Done.

+  config_.rtp.red_payload_type = recv_codecs.front().ulpfec.red_payload_type;
 
   config_.rtp.nack.rtp_history_ms =
       HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0;

[nisse-webrtc, 2017/09/21 08:37:46]

And here for some reason |begin()->| is used instead of |front().|, but that
should be the same, right?

[brandtr, 2017/09/21 08:45:22]

I believe so. This is probably an artefact of different people using different
styles, without looking at the adjacent code.

-  if (config_.rtp.ulpfec.red_rtx_payload_type != -1) {
-    config_.rtp
-        .rtx_associated_payload_types[config_.rtp.ulpfec.red_rtx_payload_type] =
-        config_.rtp.ulpfec.red_payload_type;
+  if (recv_codecs.front().ulpfec.red_rtx_payload_type != -1) {
+    config_.rtp.rtx_associated_payload_types[recv_codecs.front()
+                                                 .ulpfec.red_rtx_payload_type] =
+        recv_codecs.front().ulpfec.red_payload_type;
   }
 }
 
 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec(
     int flexfec_payload_type) {
   flexfec_config_.payload_type = flexfec_payload_type;
 }
 
 void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetLocalSsrc(
     uint32_t local_ssrc) {
@@ skipping 397 matching lines @@
     stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() -
                                                 1);
   }
 
   std::vector<webrtc::VideoStream> streams;
   streams.push_back(stream);
   return streams;
 }
 
 }  // namespace cricket