diff --git a/modules/audio_device/linux/audio_device_alsa_linux.cc b/modules/audio_device/linux/audio_device_alsa_linux.cc index 1e0ac8be28..ad15f97223 100644 --- a/modules/audio_device/linux/audio_device_alsa_linux.cc +++ b/modules/audio_device/linux/audio_device_alsa_linux.cc @@ -1516,7 +1516,7 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() { int err; snd_pcm_sframes_t frames; snd_pcm_sframes_t avail_frames; - int8_t buffer[_recordingBufferSizeIn10MS]; + std::vector buffer(_recordingBufferSizeIn10MS); Lock(); @@ -1542,7 +1542,7 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() { if (static_cast(avail_frames) > _recordingFramesLeft) avail_frames = _recordingFramesLeft; - frames = LATE(snd_pcm_readi)(_handleRecord, buffer, + frames = LATE(snd_pcm_readi)(_handleRecord, buffer.data(), avail_frames); // frames to be written if (frames < 0) { RTC_LOG(LS_ERROR) << "capture snd_pcm_readi error: " @@ -1557,8 +1557,8 @@ bool AudioDeviceLinuxALSA::RecThreadProcess() { LATE(snd_pcm_frames_to_bytes)(_handleRecord, _recordingFramesLeft); int size = LATE(snd_pcm_frames_to_bytes)(_handleRecord, frames); - memcpy(&_recordingBuffer[_recordingBufferSizeIn10MS - left_size], buffer, - size); + memcpy(&_recordingBuffer[_recordingBufferSizeIn10MS - left_size], + buffer.data(), size); _recordingFramesLeft -= frames; if (!_recordingFramesLeft) { // buf is full diff --git a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc index 669fa4d452..cef4bf4158 100644 --- a/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc +++ b/modules/congestion_controller/goog_cc/test/goog_cc_printer.cc @@ -104,13 +104,13 @@ std::deque GoogCcStatePrinter::CreateLoggers() { ->loss_based_bandwidth_estimator_v1_; }; std::deque loggers({ - Log("time", [=] { return target_.at_time; }), - Log("rtt", [=] { return target_.network_estimate.round_trip_time; }), - Log("target", [=] { return target_.target_rate; }), - Log("stable_target", [=] { return target_.stable_target_rate; }), - Log("pacing", [=] { return pacing_.data_rate(); }), - Log("padding", [=] { return pacing_.pad_rate(); }), - Log("window", [=] { return congestion_window_; }), + Log("time", [this] { return target_.at_time; }), + Log("rtt", [this] { return target_.network_estimate.round_trip_time; }), + Log("target", [this] { return target_.target_rate; }), + Log("stable_target", [this] { return target_.stable_target_rate; }), + Log("pacing", [this] { return pacing_.data_rate(); }), + Log("padding", [this] { return pacing_.pad_rate(); }), + Log("window", [this] { return congestion_window_; }), Log("rate_control_state", [=] { return rate_control_state(); }), Log("stable_estimate", [=] { return stable_estimate(); }), Log("trendline", [=] { return trend()->prev_trend_; }), @@ -118,15 +118,15 @@ std::deque GoogCcStatePrinter::CreateLoggers() { [=] { return trend()->prev_modified_trend_; }), Log("trendline_offset_threshold", [=] { return trend()->threshold_; }), Log("acknowledged_rate", [=] { return acknowledged_rate(); }), - Log("est_capacity", [=] { return est_.link_capacity; }), - Log("est_capacity_dev", [=] { return est_.link_capacity_std_dev; }), - Log("est_capacity_min", [=] { return est_.link_capacity_min; }), - Log("est_cross_traffic", [=] { return est_.cross_traffic_ratio; }), - Log("est_cross_delay", [=] { return est_.cross_delay_rate; }), - Log("est_spike_delay", [=] { return est_.spike_delay_rate; }), - Log("est_pre_buffer", [=] { return est_.pre_link_buffer_delay; }), - Log("est_post_buffer", [=] { return est_.post_link_buffer_delay; }), - Log("est_propagation", [=] { return est_.propagation_delay; }), + Log("est_capacity", [this] { return est_.link_capacity; }), + Log("est_capacity_dev", [this] { return est_.link_capacity_std_dev; }), + Log("est_capacity_min", [this] { return est_.link_capacity_min; }), + Log("est_cross_traffic", [this] { return est_.cross_traffic_ratio; }), + Log("est_cross_delay", [this] { return est_.cross_delay_rate; }), + Log("est_spike_delay", [this] { return est_.spike_delay_rate; }), + Log("est_pre_buffer", [this] { return est_.pre_link_buffer_delay; }), + Log("est_post_buffer", [this] { return est_.post_link_buffer_delay; }), + Log("est_propagation", [this] { return est_.propagation_delay; }), Log("loss_ratio", [=] { return loss_cont()->last_loss_ratio_; }), Log("loss_average", [=] { return loss_cont()->average_loss_; }), Log("loss_average_max", [=] { return loss_cont()->average_loss_max_; }), @@ -138,9 +138,9 @@ std::deque GoogCcStatePrinter::CreateLoggers() { Log("loss_based_rate", [=] { return loss_cont()->loss_based_bitrate_; }), Log("loss_ack_rate", [=] { return loss_cont()->acknowledged_bitrate_max_; }), - Log("data_window", [=] { return controller_->current_data_window_; }), + Log("data_window", [this] { return controller_->current_data_window_; }), Log("pushback_target", - [=] { return controller_->last_pushback_target_rate_; }), + [this] { return controller_->last_pushback_target_rate_; }), }); return loggers; } diff --git a/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/modules/video_coding/codecs/test/videoprocessor_unittest.cc index 8082542af3..ab218155df 100644 --- a/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -103,7 +103,8 @@ TEST_F(VideoProcessorTest, ProcessFrames_FixedFramerate) { SetRates(Field(&VideoEncoder::RateControlParameters::framerate_fps, static_cast(kFramerateFps)))) .Times(1); - q_.SendTask([=] { video_processor_->SetRates(kBitrateKbps, kFramerateFps); }); + q_.SendTask( + [this] { video_processor_->SetRates(kBitrateKbps, kFramerateFps); }); EXPECT_CALL(frame_reader_mock_, PullFrame(_, _, _)) .WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight))); @@ -132,7 +133,7 @@ TEST_F(VideoProcessorTest, ProcessFrames_VariableFramerate) { static_cast(kStartFramerateFps)))) .Times(1); q_.SendTask( - [=] { video_processor_->SetRates(kBitrateKbps, kStartFramerateFps); }); + [this] { video_processor_->SetRates(kBitrateKbps, kStartFramerateFps); }); EXPECT_CALL(frame_reader_mock_, PullFrame(_, _, _)) .WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight))); @@ -148,7 +149,7 @@ TEST_F(VideoProcessorTest, ProcessFrames_VariableFramerate) { static_cast(kNewFramerateFps)))) .Times(1); q_.SendTask( - [=] { video_processor_->SetRates(kBitrateKbps, kNewFramerateFps); }); + [this] { video_processor_->SetRates(kBitrateKbps, kNewFramerateFps); }); EXPECT_CALL(encoder_mock_, Encode(Property(&VideoFrame::rtp_timestamp, @@ -174,7 +175,8 @@ TEST_F(VideoProcessorTest, SetRates) { Field(&VideoEncoder::RateControlParameters::framerate_fps, static_cast(kFramerateFps))))) .Times(1); - q_.SendTask([=] { video_processor_->SetRates(kBitrateKbps, kFramerateFps); }); + q_.SendTask( + [this] { video_processor_->SetRates(kBitrateKbps, kFramerateFps); }); const uint32_t kNewBitrateKbps = 456; const int kNewFramerateFps = 34; @@ -188,8 +190,9 @@ TEST_F(VideoProcessorTest, SetRates) { Field(&VideoEncoder::RateControlParameters::framerate_fps, static_cast(kNewFramerateFps))))) .Times(1); - q_.SendTask( - [=] { video_processor_->SetRates(kNewBitrateKbps, kNewFramerateFps); }); + q_.SendTask([this] { + video_processor_->SetRates(kNewBitrateKbps, kNewFramerateFps); + }); ExpectRelease(); } diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc index 4cb45a325f..f3923c5f9e 100644 --- a/test/peer_scenario/peer_scenario_client.cc +++ b/test/peer_scenario/peer_scenario_client.cc @@ -348,7 +348,8 @@ void PeerScenarioClient::CreateAndSetSdp( RTC_DCHECK_RUN_ON(signaling_thread_); peer_connection_->CreateOffer( rtc::make_ref_counted( - [=](std::unique_ptr offer) { + [this, munge_offer, + offer_handler](std::unique_ptr offer) { RTC_DCHECK_RUN_ON(signaling_thread_); if (munge_offer) { munge_offer(offer.get()); @@ -371,7 +372,8 @@ void PeerScenarioClient::SetSdpOfferAndGetAnswer( std::function remote_description_set, std::function answer_handler) { if (!signaling_thread_->IsCurrent()) { - signaling_thread_->PostTask([=] { + signaling_thread_->PostTask([this, remote_offer, remote_description_set, + answer_handler] { SetSdpOfferAndGetAnswer(remote_offer, remote_description_set, answer_handler); }); @@ -380,7 +382,9 @@ void PeerScenarioClient::SetSdpOfferAndGetAnswer( RTC_DCHECK_RUN_ON(signaling_thread_); peer_connection_->SetRemoteDescription( CreateSessionDescription(SdpType::kOffer, remote_offer), - rtc::make_ref_counted([=](RTCError) { + rtc::make_ref_counted< + LambdaSetRemoteDescriptionObserver>([this, remote_description_set, + answer_handler](RTCError) { RTC_DCHECK_RUN_ON(signaling_thread_); if (remote_description_set) { // Allow the caller to modify transceivers @@ -389,7 +393,8 @@ void PeerScenarioClient::SetSdpOfferAndGetAnswer( } peer_connection_->CreateAnswer( rtc::make_ref_counted( - [=](std::unique_ptr answer) { + [this, answer_handler]( + std::unique_ptr answer) { RTC_DCHECK_RUN_ON(signaling_thread_); std::string sdp_answer; answer->ToString(&sdp_answer); @@ -410,8 +415,9 @@ void PeerScenarioClient::SetSdpAnswer( std::string remote_answer, std::function done_handler) { if (!signaling_thread_->IsCurrent()) { - signaling_thread_->PostTask( - [=] { SetSdpAnswer(remote_answer, done_handler); }); + signaling_thread_->PostTask([this, remote_answer, done_handler] { + SetSdpAnswer(remote_answer, done_handler); + }); return; } RTC_DCHECK_RUN_ON(signaling_thread_); diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc index db4918b5ca..ad271a3151 100644 --- a/test/scenario/video_stream.cc +++ b/test/scenario/video_stream.cc @@ -455,7 +455,7 @@ void SendVideoStream::UpdateConfig( } void SendVideoStream::UpdateActiveLayers(std::vector active_layers) { - sender_->task_queue_.PostTask([=] { + sender_->task_queue_.PostTask([this, active_layers] { MutexLock lock(&mutex_); VideoEncoderConfig encoder_config = CreateVideoEncoderConfig(config_); RTC_CHECK_EQ(encoder_config.simulcast_layers.size(), active_layers.size());