Replace more instances of rtc::RefCountedObject with make_ref_counted.
This is essentially replacing `new rtc::RefCountedObject` with `rtc::make_ref_counted` in many files. In a couple of places I made minor tweaks to make things compile such as adding parenthesis when they were missing. Bug: webrtc:12701 Change-Id: I3828dbf3ee0eb0232f3a47067474484ac2f4aed2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215973 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33852}
This commit is contained in:
@ -641,7 +641,7 @@ rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceModuleFromInputAndOutput(
|
||||
std::unique_ptr<AudioInput> audio_input,
|
||||
std::unique_ptr<AudioOutput> audio_output) {
|
||||
RTC_DLOG(INFO) << __FUNCTION__;
|
||||
return new rtc::RefCountedObject<AndroidAudioDeviceModule>(
|
||||
return rtc::make_ref_counted<AndroidAudioDeviceModule>(
|
||||
audio_layer, is_stereo_playout_supported, is_stereo_record_supported,
|
||||
playout_delay_ms, std::move(audio_input), std::move(audio_output));
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ EncodedImage JavaToNativeEncodedImage(JNIEnv* env,
|
||||
const size_t buffer_size = env->GetDirectBufferCapacity(j_buffer.obj());
|
||||
|
||||
EncodedImage frame;
|
||||
frame.SetEncodedData(new rtc::RefCountedObject<JavaEncodedImageBuffer>(
|
||||
frame.SetEncodedData(rtc::make_ref_counted<JavaEncodedImageBuffer>(
|
||||
env, j_encoded_image, buffer, buffer_size));
|
||||
|
||||
frame._encodedWidth = Java_EncodedImage_getEncodedWidth(env, j_encoded_image);
|
||||
|
||||
@ -551,9 +551,8 @@ static void JNI_PeerConnection_CreateOffer(
|
||||
const JavaParamRef<jobject>& j_constraints) {
|
||||
std::unique_ptr<MediaConstraints> constraints =
|
||||
JavaToNativeMediaConstraints(jni, j_constraints);
|
||||
rtc::scoped_refptr<CreateSdpObserverJni> observer(
|
||||
new rtc::RefCountedObject<CreateSdpObserverJni>(jni, j_observer,
|
||||
std::move(constraints)));
|
||||
auto observer = rtc::make_ref_counted<CreateSdpObserverJni>(
|
||||
jni, j_observer, std::move(constraints));
|
||||
PeerConnectionInterface::RTCOfferAnswerOptions options;
|
||||
CopyConstraintsIntoOfferAnswerOptions(observer->constraints(), &options);
|
||||
ExtractNativePC(jni, j_pc)->CreateOffer(observer, options);
|
||||
@ -566,9 +565,8 @@ static void JNI_PeerConnection_CreateAnswer(
|
||||
const JavaParamRef<jobject>& j_constraints) {
|
||||
std::unique_ptr<MediaConstraints> constraints =
|
||||
JavaToNativeMediaConstraints(jni, j_constraints);
|
||||
rtc::scoped_refptr<CreateSdpObserverJni> observer(
|
||||
new rtc::RefCountedObject<CreateSdpObserverJni>(jni, j_observer,
|
||||
std::move(constraints)));
|
||||
auto observer = rtc::make_ref_counted<CreateSdpObserverJni>(
|
||||
jni, j_observer, std::move(constraints));
|
||||
PeerConnectionInterface::RTCOfferAnswerOptions options;
|
||||
CopyConstraintsIntoOfferAnswerOptions(observer->constraints(), &options);
|
||||
ExtractNativePC(jni, j_pc)->CreateAnswer(observer, options);
|
||||
@ -578,8 +576,8 @@ static void JNI_PeerConnection_SetLocalDescriptionAutomatically(
|
||||
JNIEnv* jni,
|
||||
const JavaParamRef<jobject>& j_pc,
|
||||
const JavaParamRef<jobject>& j_observer) {
|
||||
rtc::scoped_refptr<SetLocalSdpObserverJni> observer(
|
||||
new rtc::RefCountedObject<SetLocalSdpObserverJni>(jni, j_observer));
|
||||
auto observer =
|
||||
rtc::make_ref_counted<SetLocalSdpObserverJni>(jni, j_observer);
|
||||
ExtractNativePC(jni, j_pc)->SetLocalDescription(observer);
|
||||
}
|
||||
|
||||
@ -588,8 +586,8 @@ static void JNI_PeerConnection_SetLocalDescription(
|
||||
const JavaParamRef<jobject>& j_pc,
|
||||
const JavaParamRef<jobject>& j_observer,
|
||||
const JavaParamRef<jobject>& j_sdp) {
|
||||
rtc::scoped_refptr<SetLocalSdpObserverJni> observer(
|
||||
new rtc::RefCountedObject<SetLocalSdpObserverJni>(jni, j_observer));
|
||||
auto observer =
|
||||
rtc::make_ref_counted<SetLocalSdpObserverJni>(jni, j_observer);
|
||||
ExtractNativePC(jni, j_pc)->SetLocalDescription(
|
||||
JavaToNativeSessionDescription(jni, j_sdp), observer);
|
||||
}
|
||||
@ -599,8 +597,8 @@ static void JNI_PeerConnection_SetRemoteDescription(
|
||||
const JavaParamRef<jobject>& j_pc,
|
||||
const JavaParamRef<jobject>& j_observer,
|
||||
const JavaParamRef<jobject>& j_sdp) {
|
||||
rtc::scoped_refptr<SetRemoteSdpObserverJni> observer(
|
||||
new rtc::RefCountedObject<SetRemoteSdpObserverJni>(jni, j_observer));
|
||||
auto observer =
|
||||
rtc::make_ref_counted<SetRemoteSdpObserverJni>(jni, j_observer);
|
||||
ExtractNativePC(jni, j_pc)->SetRemoteDescription(
|
||||
JavaToNativeSessionDescription(jni, j_sdp), observer);
|
||||
}
|
||||
@ -799,8 +797,7 @@ static jboolean JNI_PeerConnection_OldGetStats(
|
||||
const JavaParamRef<jobject>& j_pc,
|
||||
const JavaParamRef<jobject>& j_observer,
|
||||
jlong native_track) {
|
||||
rtc::scoped_refptr<StatsObserverJni> observer(
|
||||
new rtc::RefCountedObject<StatsObserverJni>(jni, j_observer));
|
||||
auto observer = rtc::make_ref_counted<StatsObserverJni>(jni, j_observer);
|
||||
return ExtractNativePC(jni, j_pc)->GetStats(
|
||||
observer, reinterpret_cast<MediaStreamTrackInterface*>(native_track),
|
||||
PeerConnectionInterface::kStatsOutputLevelStandard);
|
||||
@ -810,9 +807,8 @@ static void JNI_PeerConnection_NewGetStats(
|
||||
JNIEnv* jni,
|
||||
const JavaParamRef<jobject>& j_pc,
|
||||
const JavaParamRef<jobject>& j_callback) {
|
||||
rtc::scoped_refptr<RTCStatsCollectorCallbackWrapper> callback(
|
||||
new rtc::RefCountedObject<RTCStatsCollectorCallbackWrapper>(jni,
|
||||
j_callback));
|
||||
auto callback =
|
||||
rtc::make_ref_counted<RTCStatsCollectorCallbackWrapper>(jni, j_callback);
|
||||
ExtractNativePC(jni, j_pc)->GetStats(callback);
|
||||
}
|
||||
|
||||
|
||||
@ -46,9 +46,8 @@ void* CreateVideoSource(JNIEnv* env,
|
||||
rtc::Thread* worker_thread,
|
||||
jboolean is_screencast,
|
||||
jboolean align_timestamps) {
|
||||
rtc::scoped_refptr<AndroidVideoTrackSource> source(
|
||||
new rtc::RefCountedObject<AndroidVideoTrackSource>(
|
||||
signaling_thread, env, is_screencast, align_timestamps));
|
||||
auto source = rtc::make_ref_counted<AndroidVideoTrackSource>(
|
||||
signaling_thread, env, is_screencast, align_timestamps);
|
||||
return source.release();
|
||||
}
|
||||
|
||||
|
||||
@ -77,8 +77,8 @@ rtc::scoped_refptr<AndroidVideoI420Buffer> AndroidVideoI420Buffer::Adopt(
|
||||
int width,
|
||||
int height,
|
||||
const JavaRef<jobject>& j_video_frame_buffer) {
|
||||
return new rtc::RefCountedObject<AndroidVideoI420Buffer>(
|
||||
jni, width, height, j_video_frame_buffer);
|
||||
return rtc::make_ref_counted<AndroidVideoI420Buffer>(jni, width, height,
|
||||
j_video_frame_buffer);
|
||||
}
|
||||
|
||||
AndroidVideoI420Buffer::AndroidVideoI420Buffer(
|
||||
@ -123,8 +123,7 @@ int64_t GetJavaVideoFrameTimestampNs(JNIEnv* jni,
|
||||
rtc::scoped_refptr<AndroidVideoBuffer> AndroidVideoBuffer::Adopt(
|
||||
JNIEnv* jni,
|
||||
const JavaRef<jobject>& j_video_frame_buffer) {
|
||||
return new rtc::RefCountedObject<AndroidVideoBuffer>(jni,
|
||||
j_video_frame_buffer);
|
||||
return rtc::make_ref_counted<AndroidVideoBuffer>(jni, j_video_frame_buffer);
|
||||
}
|
||||
|
||||
rtc::scoped_refptr<AndroidVideoBuffer> AndroidVideoBuffer::Create(
|
||||
|
||||
Reference in New Issue
Block a user