From 03486fc1979b62e96740326d71fbee909eac717c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Mon, 25 Apr 2022 10:46:59 +0200 Subject: [PATCH] Update sdk/ to not use implicit conversion from scoped_refptr to T*. Bug: webrtc:13464 Change-Id: I6944106ddc99c043825fad077bfcedc051c67d8f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259772 Reviewed-by: Magnus Jedvert Commit-Queue: Niels Moller Reviewed-by: Peter Hanspers Cr-Commit-Position: refs/heads/main@{#36682} --- .../peer_connection_factory_unittest.cc | 2 +- sdk/android/src/jni/pc/media_stream.cc | 2 +- sdk/android/src/jni/pc/peer_connection.cc | 16 ++++++++------ sdk/objc/api/peerconnection/RTCAudioTrack.mm | 2 +- .../peerconnection/RTCPeerConnection+Stats.mm | 4 ++-- .../api/peerconnection/RTCPeerConnection.mm | 8 +++---- .../RTCPeerConnectionFactory.mm | 4 ++-- .../RTCPeerConnectionFactoryBuilder.mm | 2 +- sdk/objc/api/peerconnection/RTCRtpSender.mm | 2 +- sdk/objc/api/peerconnection/RTCVideoTrack.mm | 3 +-- sdk/objc/native/api/video_capturer.mm | 3 ++- .../unittests/ObjCVideoTrackSource_xctest.mm | 22 +++++++++---------- 12 files changed, 36 insertions(+), 34 deletions(-) diff --git a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc index fd988a567b..8bb6e33e65 100644 --- a/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc +++ b/sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc @@ -67,7 +67,7 @@ rtc::scoped_refptr CreateTestPCF( RTC_LOG(LS_INFO) << "Media engine created: " << pcf_deps.media_engine.get(); auto factory = CreateModularPeerConnectionFactory(std::move(pcf_deps)); - RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << factory; + RTC_LOG(LS_INFO) << "PeerConnectionFactory created: " << factory.get(); RTC_CHECK(factory) << "Failed to create the peer connection factory; " "WebRTC/libjingle init likely failed on this device"; diff --git a/sdk/android/src/jni/pc/media_stream.cc b/sdk/android/src/jni/pc/media_stream.cc index 2f0be5d639..20d59a6f8f 100644 --- a/sdk/android/src/jni/pc/media_stream.cc +++ b/sdk/android/src/jni/pc/media_stream.cc @@ -29,7 +29,7 @@ JavaMediaStream::JavaMediaStream( // Create an observer to update the Java stream when the native stream's set // of tracks changes. observer_.reset(new MediaStreamObserver( - media_stream, + media_stream.get(), [this](AudioTrackInterface* audio_track, MediaStreamInterface* media_stream) { OnAudioTrackAddedToStream(audio_track, media_stream); diff --git a/sdk/android/src/jni/pc/peer_connection.cc b/sdk/android/src/jni/pc/peer_connection.cc index 2aa1c9e705..502763a2d0 100644 --- a/sdk/android/src/jni/pc/peer_connection.cc +++ b/sdk/android/src/jni/pc/peer_connection.cc @@ -391,8 +391,9 @@ void PeerConnectionObserverJni::OnAddStream( void PeerConnectionObserverJni::OnRemoveStream( rtc::scoped_refptr stream) { JNIEnv* env = AttachCurrentThreadIfNeeded(); - NativeToJavaStreamsMap::iterator it = remote_streams_.find(stream); - RTC_CHECK(it != remote_streams_.end()) << "unexpected stream: " << stream; + NativeToJavaStreamsMap::iterator it = remote_streams_.find(stream.get()); + RTC_CHECK(it != remote_streams_.end()) + << "unexpected stream: " << stream.get(); Java_Observer_onRemoveStream(env, j_observer_global_, it->second.j_media_stream()); remote_streams_.erase(it); @@ -447,7 +448,7 @@ void PeerConnectionObserverJni::OnTrack( JavaMediaStream& PeerConnectionObserverJni::GetOrCreateJavaStream( JNIEnv* env, const rtc::scoped_refptr& stream) { - NativeToJavaStreamsMap::iterator it = remote_streams_.find(stream); + NativeToJavaStreamsMap::iterator it = remote_streams_.find(stream.get()); if (it == remote_streams_.end()) { it = remote_streams_ .emplace(std::piecewise_construct, @@ -579,7 +580,7 @@ static void JNI_PeerConnection_CreateOffer( jni, j_observer, std::move(constraints)); PeerConnectionInterface::RTCOfferAnswerOptions options; CopyConstraintsIntoOfferAnswerOptions(observer->constraints(), &options); - ExtractNativePC(jni, j_pc)->CreateOffer(observer, options); + ExtractNativePC(jni, j_pc)->CreateOffer(observer.get(), options); } static void JNI_PeerConnection_CreateAnswer( @@ -593,7 +594,7 @@ static void JNI_PeerConnection_CreateAnswer( jni, j_observer, std::move(constraints)); PeerConnectionInterface::RTCOfferAnswerOptions options; CopyConstraintsIntoOfferAnswerOptions(observer->constraints(), &options); - ExtractNativePC(jni, j_pc)->CreateAnswer(observer, options); + ExtractNativePC(jni, j_pc)->CreateAnswer(observer.get(), options); } static void JNI_PeerConnection_SetLocalDescriptionAutomatically( @@ -827,7 +828,8 @@ static jboolean JNI_PeerConnection_OldGetStats( jlong native_track) { auto observer = rtc::make_ref_counted(jni, j_observer); return ExtractNativePC(jni, j_pc)->GetStats( - observer, reinterpret_cast(native_track), + observer.get(), + reinterpret_cast(native_track), PeerConnectionInterface::kStatsOutputLevelStandard); } @@ -837,7 +839,7 @@ static void JNI_PeerConnection_NewGetStats( const JavaParamRef& j_callback) { auto callback = rtc::make_ref_counted(jni, j_callback); - ExtractNativePC(jni, j_pc)->GetStats(callback); + ExtractNativePC(jni, j_pc)->GetStats(callback.get()); } static jboolean JNI_PeerConnection_SetBitrate( diff --git a/sdk/objc/api/peerconnection/RTCAudioTrack.mm b/sdk/objc/api/peerconnection/RTCAudioTrack.mm index 73ec98f2aa..5c1736f436 100644 --- a/sdk/objc/api/peerconnection/RTCAudioTrack.mm +++ b/sdk/objc/api/peerconnection/RTCAudioTrack.mm @@ -30,7 +30,7 @@ std::string nativeId = [NSString stdStringForString:trackId]; rtc::scoped_refptr track = - factory.nativeFactory->CreateAudioTrack(nativeId, source.nativeAudioSource); + factory.nativeFactory->CreateAudioTrack(nativeId, source.nativeAudioSource.get()); if (self = [self initWithFactory:factory nativeTrack:track type:RTCMediaStreamTrackTypeAudio]) { _source = source; } diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection+Stats.mm b/sdk/objc/api/peerconnection/RTCPeerConnection+Stats.mm index 7f8b123cc1..f8d38143f3 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnection+Stats.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnection+Stats.mm @@ -84,7 +84,7 @@ class StatsObserverAdapter : public StatsObserver { - (void)statisticsWithCompletionHandler:(RTCStatisticsCompletionHandler)completionHandler { rtc::scoped_refptr collector = rtc::make_ref_counted(completionHandler); - self.nativePeerConnection->GetStats(collector); + self.nativePeerConnection->GetStats(collector.get()); } - (void)statsForTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)mediaStreamTrack @@ -96,7 +96,7 @@ class StatsObserverAdapter : public StatsObserver { webrtc::PeerConnectionInterface::StatsOutputLevel nativeOutputLevel = [[self class] nativeStatsOutputLevelForLevel:statsOutputLevel]; self.nativePeerConnection->GetStats( - observer, mediaStreamTrack.nativeTrack, nativeOutputLevel); + observer.get(), mediaStreamTrack.nativeTrack.get(), nativeOutputLevel); } @end diff --git a/sdk/objc/api/peerconnection/RTCPeerConnection.mm b/sdk/objc/api/peerconnection/RTCPeerConnection.mm index 203fa4a923..f4db472380 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnection.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnection.mm @@ -492,7 +492,7 @@ void PeerConnectionDelegateAdapter::OnRemoveTrack( } - (void)addStream:(RTC_OBJC_TYPE(RTCMediaStream) *)stream { - if (!_peerConnection->AddStream(stream.nativeMediaStream)) { + if (!_peerConnection->AddStream(stream.nativeMediaStream.get())) { RTCLogError(@"Failed to add stream: %@", stream); return; } @@ -500,7 +500,7 @@ void PeerConnectionDelegateAdapter::OnRemoveTrack( } - (void)removeStream:(RTC_OBJC_TYPE(RTCMediaStream) *)stream { - _peerConnection->RemoveStream(stream.nativeMediaStream); + _peerConnection->RemoveStream(stream.nativeMediaStream.get()); [_localStreams removeObject:stream]; } @@ -583,7 +583,7 @@ void PeerConnectionDelegateAdapter::OnRemoveTrack( webrtc::PeerConnectionInterface::RTCOfferAnswerOptions options; CopyConstraintsIntoOfferAnswerOptions(constraints.nativeConstraints.get(), &options); - _peerConnection->CreateOffer(observer, options); + _peerConnection->CreateOffer(observer.get(), options); } - (void)answerForConstraints:(RTC_OBJC_TYPE(RTCMediaConstraints) *)constraints @@ -594,7 +594,7 @@ void PeerConnectionDelegateAdapter::OnRemoveTrack( webrtc::PeerConnectionInterface::RTCOfferAnswerOptions options; CopyConstraintsIntoOfferAnswerOptions(constraints.nativeConstraints.get(), &options); - _peerConnection->CreateAnswer(observer, options); + _peerConnection->CreateAnswer(observer.get(), options); } - (void)setLocalDescription:(RTC_OBJC_TYPE(RTCSessionDescription) *)sdp diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm index f7a17558f0..4e5aa19750 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm @@ -88,7 +88,7 @@ RTCVideoEncoderFactoryH264) alloc] init]) nativeVideoDecoderFactory:webrtc::ObjCToNativeVideoDecoderFactory([[RTC_OBJC_TYPE( RTCVideoDecoderFactoryH264) alloc] init]) - audioDeviceModule:[self audioDeviceModule] + audioDeviceModule:[self audioDeviceModule].get() audioProcessingModule:nullptr]; #endif } @@ -111,7 +111,7 @@ nativeAudioDecoderFactory:webrtc::CreateBuiltinAudioDecoderFactory() nativeVideoEncoderFactory:std::move(native_encoder_factory) nativeVideoDecoderFactory:std::move(native_decoder_factory) - audioDeviceModule:[self audioDeviceModule] + audioDeviceModule:[self audioDeviceModule].get() audioProcessingModule:nullptr]; #endif } diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.mm index 991ec5a41c..627909a0e3 100644 --- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.mm +++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactoryBuilder.mm @@ -38,7 +38,7 @@ nativeAudioDecoderFactory:_audioDecoderFactory nativeVideoEncoderFactory:std::move(_videoEncoderFactory) nativeVideoDecoderFactory:std::move(_videoDecoderFactory) - audioDeviceModule:_audioDeviceModule + audioDeviceModule:_audioDeviceModule.get() audioProcessingModule:_audioProcessingModule]; } diff --git a/sdk/objc/api/peerconnection/RTCRtpSender.mm b/sdk/objc/api/peerconnection/RTCRtpSender.mm index 12566ecf6f..4fadb30f49 100644 --- a/sdk/objc/api/peerconnection/RTCRtpSender.mm +++ b/sdk/objc/api/peerconnection/RTCRtpSender.mm @@ -52,7 +52,7 @@ } - (void)setTrack:(RTC_OBJC_TYPE(RTCMediaStreamTrack) *)track { - if (!_nativeRtpSender->SetTrack(track.nativeTrack)) { + if (!_nativeRtpSender->SetTrack(track.nativeTrack.get())) { RTCLogError(@"RTC_OBJC_TYPE(RTCRtpSender)(%p): Failed to set track %@", self, track); } } diff --git a/sdk/objc/api/peerconnection/RTCVideoTrack.mm b/sdk/objc/api/peerconnection/RTCVideoTrack.mm index d9eddde407..8944d26c13 100644 --- a/sdk/objc/api/peerconnection/RTCVideoTrack.mm +++ b/sdk/objc/api/peerconnection/RTCVideoTrack.mm @@ -30,8 +30,7 @@ NSParameterAssert(trackId.length); std::string nativeId = [NSString stdStringForString:trackId]; rtc::scoped_refptr track = - factory.nativeFactory->CreateVideoTrack(nativeId, - source.nativeVideoSource); + factory.nativeFactory->CreateVideoTrack(nativeId, source.nativeVideoSource.get()); if (self = [self initWithFactory:factory nativeTrack:track type:RTCMediaStreamTrackTypeVideo]) { _source = source; } diff --git a/sdk/objc/native/api/video_capturer.mm b/sdk/objc/native/api/video_capturer.mm index 0101c79a1b..4b065b51be 100644 --- a/sdk/objc/native/api/video_capturer.mm +++ b/sdk/objc/native/api/video_capturer.mm @@ -25,7 +25,8 @@ rtc::scoped_refptr ObjCToNativeVideoCapturer( rtc::scoped_refptr objc_video_track_source = rtc::make_ref_counted(adapter); rtc::scoped_refptr video_source = - webrtc::CreateVideoTrackSourceProxy(signaling_thread, worker_thread, objc_video_track_source); + webrtc::CreateVideoTrackSourceProxy( + signaling_thread, worker_thread, objc_video_track_source.get()); objc_video_capturer.delegate = adapter; diff --git a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm index 8bd1f1a2fe..ffa8a6ca79 100644 --- a/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm +++ b/sdk/objc/unittests/ObjCVideoTrackSource_xctest.mm @@ -73,7 +73,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface cricket::FakeVideoRenderer *video_renderer = new cricket::FakeVideoRenderer(); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(video_renderer, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -105,7 +105,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface cricket::FakeVideoRenderer *video_renderer = new cricket::FakeVideoRenderer(); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(video_renderer, video_sink_wants); _video_source->OnOutputFormatRequest(912, 514, 30); @@ -135,7 +135,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface cricket::FakeVideoRenderer *video_renderer = new cricket::FakeVideoRenderer(); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(video_renderer, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -188,7 +188,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -224,7 +224,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -260,7 +260,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -305,7 +305,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(480, 270, 30); @@ -349,7 +349,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -393,7 +393,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -426,7 +426,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30); @@ -458,7 +458,7 @@ class ObjCCallbackVideoSink : public rtc::VideoSinkInterface }); const rtc::VideoSinkWants video_sink_wants; - rtc::VideoSourceInterface *video_source_interface = _video_source; + rtc::VideoSourceInterface *video_source_interface = _video_source.get(); video_source_interface->AddOrUpdateSink(&callback_video_sink, video_sink_wants); _video_source->OnOutputFormatRequest(640, 360, 30);