diff --git a/video/adaptation/pixel_limit_resource.cc b/video/adaptation/pixel_limit_resource.cc index 36c93cd4fa..70820e51a3 100644 --- a/video/adaptation/pixel_limit_resource.cc +++ b/video/adaptation/pixel_limit_resource.cc @@ -84,11 +84,11 @@ void PixelLimitResource::SetResourceListener(ResourceListener* listener) { int target_pixels_lower_bounds = GetLowerResolutionThan(target_pixel_upper_bounds); if (current_pixels > target_pixel_upper_bounds) { - listener_->OnResourceUsageStateMeasured(this, - ResourceUsageState::kOveruse); + listener_->OnResourceUsageStateMeasured( + rtc::scoped_refptr(this), ResourceUsageState::kOveruse); } else if (current_pixels < target_pixels_lower_bounds) { - listener_->OnResourceUsageStateMeasured(this, - ResourceUsageState::kUnderuse); + listener_->OnResourceUsageStateMeasured( + rtc::scoped_refptr(this), ResourceUsageState::kUnderuse); } return kResourceUsageCheckIntervalMs; }); diff --git a/video/adaptation/video_stream_encoder_resource.cc b/video/adaptation/video_stream_encoder_resource.cc index d26da708b6..ad89aef52a 100644 --- a/video/adaptation/video_stream_encoder_resource.cc +++ b/video/adaptation/video_stream_encoder_resource.cc @@ -51,7 +51,8 @@ void VideoStreamEncoderResource::OnResourceUsageStateMeasured( ResourceUsageState usage_state) { MutexLock crit(&lock_); if (listener_) { - listener_->OnResourceUsageStateMeasured(this, usage_state); + listener_->OnResourceUsageStateMeasured(rtc::scoped_refptr(this), + usage_state); } } diff --git a/video/buffered_frame_decryptor_unittest.cc b/video/buffered_frame_decryptor_unittest.cc index 2f8a183ba1..7d0f6d3399 100644 --- a/video/buffered_frame_decryptor_unittest.cc +++ b/video/buffered_frame_decryptor_unittest.cc @@ -89,7 +89,7 @@ class BufferedFrameDecryptorTest : public ::testing::Test, mock_frame_decryptor_ = rtc::make_ref_counted(); buffered_frame_decryptor_ = std::make_unique(this, this); - buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_.get()); + buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_); } static const size_t kMaxStashedFrames; @@ -219,7 +219,7 @@ TEST_F(BufferedFrameDecryptorTest, FramesStoredIfDecryptorNull) { .WillRepeatedly(Return(0)); // Attach the frame decryptor at a later point after frames have arrived. - buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_.get()); + buffered_frame_decryptor_->SetFrameDecryptor(mock_frame_decryptor_); // Next frame should trigger kMaxStashedFrame decryptions. buffered_frame_decryptor_->ManageEncryptedFrame(CreateRtpFrameObject(true)); diff --git a/video/rtp_video_stream_receiver_frame_transformer_delegate.cc b/video/rtp_video_stream_receiver_frame_transformer_delegate.cc index c54939fe5a..90f9ad94f0 100644 --- a/video/rtp_video_stream_receiver_frame_transformer_delegate.cc +++ b/video/rtp_video_stream_receiver_frame_transformer_delegate.cc @@ -102,8 +102,8 @@ void RtpVideoStreamReceiverFrameTransformerDelegate::TransformFrame( void RtpVideoStreamReceiverFrameTransformerDelegate::OnTransformedFrame( std::unique_ptr frame) { - rtc::scoped_refptr delegate = - this; + rtc::scoped_refptr delegate( + this); network_thread_->PostTask(ToQueuedTask( [delegate = std::move(delegate), frame = std::move(frame)]() mutable { delegate->ManageFrame(std::move(frame));