zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update sdk/ to not use implicit conversion from scoped_refptr<T> to T*.

Browse Source 
Bug: webrtc:13464
Change-Id: I6944106ddc99c043825fad077bfcedc051c67d8f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/259772
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36682}
This commit is contained in:
Niels Möller
2022-04-25 10:46:59 +02:00
committed by WebRTC LUCI CQ
parent 3ba35c3fe2
commit 03486fc197
12 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/native_unittests/peerconnection/peer_connection_factory_unittest.cc
View File

@ -67,7 +67,7 @@ rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 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";

2
sdk/android/src/jni/pc/media_stream.cc
View File

@ -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);

16
sdk/android/src/jni/pc/peer_connection.cc
View File

@ -391,8 +391,9 @@ void PeerConnectionObserverJni::OnAddStream(
void PeerConnectionObserverJni::OnRemoveStream(
rtc::scoped_refptr<MediaStreamInterface> 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<MediaStreamInterface>& 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<StatsObserverJni>(jni, j_observer);
return ExtractNativePC(jni, j_pc)->GetStats(
observer, reinterpret_cast<MediaStreamTrackInterface*>(native_track),
observer.get(),
reinterpret_cast<MediaStreamTrackInterface*>(native_track),
PeerConnectionInterface::kStatsOutputLevelStandard);
}
@ -837,7 +839,7 @@ static void JNI_PeerConnection_NewGetStats(
const JavaParamRef<jobject>& j_callback) {
auto callback =
rtc::make_ref_counted<RTCStatsCollectorCallbackWrapper>(jni, j_callback);
ExtractNativePC(jni, j_pc)->GetStats(callback);
ExtractNativePC(jni, j_pc)->GetStats(callback.get());
}
static jboolean JNI_PeerConnection_SetBitrate(