Fix places that trigger no-unused-lambda-capture

webrtc/video/end_to_end_tests.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.
  */
 #include <algorithm>
@@ skipping 2944 matching lines @@
   } test;
 
   test::ScopedFieldTrials override_field_trials(
       "WebRTC-VideoContentTypeExtension/Enabled/");
   metrics::Reset();
 
   Call::Config send_config(test.GetSenderCallConfig());
   Call::Config recv_config(test.GetReceiverCallConfig());
   VideoEncoderConfig encoder_config_with_screenshare;
 
-  task_queue_.SendTask([this, &test, &override_field_trials, &send_config,
-                        &recv_config, &encoder_config_with_screenshare]() {
+  task_queue_.SendTask([this, &test, &send_config, &recv_config,
+                        &encoder_config_with_screenshare]() {
     CreateSenderCall(send_config);
     CreateReceiverCall(recv_config);
 
     receive_transport_.reset(test.CreateReceiveTransport(&task_queue_));
     send_transport_.reset(
         test.CreateSendTransport(&task_queue_, sender_call_.get()));
     send_transport_->SetReceiver(receiver_call_->Receiver());
     receive_transport_->SetReceiver(sender_call_->Receiver());
 
     receiver_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
@@ skipping 1285 matching lines @@
 
       return SEND_PACKET;
     }
 
     rtc::Optional<uint16_t> last_observed_sequence_number_ GUARDED_BY(crit_);
     rtc::Optional<uint32_t> last_observed_timestamp_ GUARDED_BY(crit_);
     size_t num_flexfec_packets_sent_ GUARDED_BY(crit_);
     rtc::CriticalSection crit_;
   } observer;
 
-  constexpr int kFrameMaxWidth = 320;
-  constexpr int kFrameMaxHeight = 180;
-  constexpr int kFrameRate = 15;
+  // These would have been declared as constexpr, but then some compilers
+  // require them to be captured in the lambda, and other compilers complain

[nisse-webrtc, 2017/08/23 09:42:02]

If I understood you correctly, it's some windows compiler which is the exception
(and probably buggy), requiring the constants to be included in the capture
list. So if it's a workaround for a compiler bug, be a bit more explicit about
which compiler is broken.

[eladalon, 2017/08/23 10:26:26]

Might take some time. I suggest lgtm-izing this CL, unblocking some internal
projects, and landing a fix of the comment afterwards. (I'll get to work finding
out which compiler it is right away.)

+  // about no-ununused-lambda-capture. Keeping them as normal variables was
+  // the easiest work-around.
+  int kFrameMaxWidth = 320;

[stefan-webrtc, 2017/08/23 09:37:25]

const?

[eladalon, 2017/08/23 10:26:26]

Same answer.

+  int kFrameMaxHeight = 180;
+  int kFrameRate = 15;
 
   Call::Config config(event_log_.get());
 
   std::unique_ptr<test::PacketTransport> send_transport;
   std::unique_ptr<test::PacketTransport> receive_transport;
   std::unique_ptr<VideoEncoder> encoder;
 
   task_queue_.SendTask([&]() {
     CreateCalls(config, config);
 
@@ skipping 718 matching lines @@
     std::unique_ptr<VideoEncoder> encoder_;
     std::unique_ptr<VideoDecoder> decoder_;
     rtc::CriticalSection crit_;
     int recorded_frames_ GUARDED_BY(crit_);
   } test(this);
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc