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

Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/

Browse Source 
BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1722083002

Cr-Commit-Position: refs/heads/master@{#11740}
This commit is contained in:
kwiberg
2016-02-24 05:00:36 -08:00
committed by Commit bot
parent 58e08cbea8
commit f01633e667
24 changed files with 111 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_device/android/audio_track_jni.cc
View File

@ -31,7 +31,7 @@ namespace webrtc {
// AudioTrackJni::JavaAudioTrack implementation.
AudioTrackJni::JavaAudioTrack::JavaAudioTrack(
NativeRegistration* native_reg,
rtc::scoped_ptr<GlobalRef> audio_track)
std::unique_ptr<GlobalRef> audio_track)
: audio_track_(std::move(audio_track)),
init_playout_(native_reg->GetMethodId("initPlayout", "(II)V")),
start_playout_(native_reg->GetMethodId("startPlayout", "()Z")),
@ -69,7 +69,7 @@ int AudioTrackJni::JavaAudioTrack::GetStreamVolume() {
// TODO(henrika): possible extend usage of AudioManager and add it as member.
AudioTrackJni::AudioTrackJni(AudioManager* audio_manager)
: j_environment_(JVM::GetInstance()->environment()),
: j_environment_(rtc::ScopedToUnique(JVM::GetInstance()->environment())),
audio_parameters_(audio_manager->GetPlayoutAudioParameters()),
direct_buffer_address_(nullptr),
direct_buffer_capacity_in_bytes_(0),
@ -86,14 +86,14 @@ AudioTrackJni::AudioTrackJni(AudioManager* audio_manager)
&webrtc::AudioTrackJni::CacheDirectBufferAddress)},
{"nativeGetPlayoutData", "(IJ)V",
reinterpret_cast<void*>(&webrtc::AudioTrackJni::GetPlayoutData)}};
j_native_registration_ = j_environment_->RegisterNatives(
j_native_registration_ = rtc::ScopedToUnique(j_environment_->RegisterNatives(
"org/webrtc/voiceengine/WebRtcAudioTrack",
native_methods, arraysize(native_methods));
native_methods, arraysize(native_methods)));
j_audio_track_.reset(new JavaAudioTrack(
j_native_registration_.get(),
j_native_registration_->NewObject(
rtc::ScopedToUnique(j_native_registration_->NewObject(
"<init>", "(Landroid/content/Context;J)V",
JVM::GetInstance()->context(), PointerTojlong(this))));
JVM::GetInstance()->context(), PointerTojlong(this)))));
// Detach from this thread since we want to use the checker to verify calls
// from the Java based audio thread.
thread_checker_java_.DetachFromThread();