Fix places that trigger no-unused-lambda-capture - change to using static-constexpr

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 4260 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;
 
-  // These would have been declared as constexpr, but then some compilers
-  // require them to be captured in the lambda, and other compilers complain
-  // about no-ununused-lambda-capture. Keeping them as normal variables was
-  // the easiest work-around.
-  int kFrameMaxWidth = 320;
-  int kFrameMaxHeight = 180;
-  int kFrameRate = 15;
+  static constexpr int kFrameMaxWidth = 320;
+  static constexpr int kFrameMaxHeight = 180;
+  static constexpr 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 66 matching lines @@
 
   task_queue_.SendTask([this, &observer]() {
     // Ensure monotonicity when the VideoSendStream is restarted.
     Stop();
     observer.ResetPacketCount();
     Start();
   });
 
   EXPECT_TRUE(observer.Wait()) << "Timed out waiting for packets.";
 
-  task_queue_.SendTask([this, &observer,
-                        kFrameRate, kFrameMaxWidth, kFrameMaxHeight]() {
+  task_queue_.SendTask([this, &observer]() {
     // Ensure monotonicity when the VideoSendStream is recreated.
     frame_generator_capturer_->Stop();
     sender_call_->DestroyVideoSendStream(video_send_stream_);
     observer.ResetPacketCount();
     video_send_stream_ = sender_call_->CreateVideoSendStream(
         video_send_config_.Copy(), video_encoder_config_.Copy());
     video_send_stream_->Start();
     CreateFrameGeneratorCapturer(kFrameRate, kFrameMaxWidth, kFrameMaxHeight);
     frame_generator_capturer_->Start();
   });
@@ skipping 630 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