OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/audio/android/audio_manager_android.h" | 5 #include "media/audio/android/audio_manager_android.h" |
6 | 6 |
7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
8 #include "base/android/context_utils.h" | 8 #include "base/android/context_utils.h" |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/ptr_util.h" | |
14 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
15 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
16 #include "jni/AudioManagerAndroid_jni.h" | 17 #include "jni/AudioManagerAndroid_jni.h" |
17 #include "media/audio/android/audio_record_input.h" | 18 #include "media/audio/android/audio_record_input.h" |
18 #include "media/audio/android/opensles_input.h" | 19 #include "media/audio/android/opensles_input.h" |
19 #include "media/audio/android/opensles_output.h" | 20 #include "media/audio/android/opensles_output.h" |
20 #include "media/audio/audio_device_description.h" | 21 #include "media/audio/audio_device_description.h" |
21 #include "media/audio/audio_manager.h" | 22 #include "media/audio/audio_manager.h" |
22 #include "media/audio/fake_audio_input_stream.h" | 23 #include "media/audio/fake_audio_input_stream.h" |
23 #include "media/base/audio_parameters.h" | 24 #include "media/base/audio_parameters.h" |
(...skipping 15 matching lines...) Expand all Loading... | |
39 } | 40 } |
40 | 41 |
41 // Maximum number of output streams that can be open simultaneously. | 42 // Maximum number of output streams that can be open simultaneously. |
42 const int kMaxOutputStreams = 10; | 43 const int kMaxOutputStreams = 10; |
43 | 44 |
44 const int kDefaultInputBufferSize = 1024; | 45 const int kDefaultInputBufferSize = 1024; |
45 const int kDefaultOutputBufferSize = 2048; | 46 const int kDefaultOutputBufferSize = 2048; |
46 | 47 |
47 } // namespace | 48 } // namespace |
48 | 49 |
49 ScopedAudioManagerPtr CreateAudioManager( | 50 std::unique_ptr<AudioManager> CreateAudioManager( |
50 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 51 std::unique_ptr<AudioThread> audio_thread, |
51 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, | |
52 AudioLogFactory* audio_log_factory) { | 52 AudioLogFactory* audio_log_factory) { |
53 return ScopedAudioManagerPtr(new AudioManagerAndroid( | 53 return base::MakeUnique<AudioManagerAndroid>(std::move(audio_thread), |
54 std::move(task_runner), std::move(worker_task_runner), | 54 audio_log_factory); |
55 audio_log_factory)); | |
56 } | 55 } |
57 | 56 |
58 AudioManagerAndroid::AudioManagerAndroid( | 57 AudioManagerAndroid::AudioManagerAndroid( |
59 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 58 std::unique_ptr<AudioThread> audio_thread, |
60 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, | |
61 AudioLogFactory* audio_log_factory) | 59 AudioLogFactory* audio_log_factory) |
62 : AudioManagerBase(std::move(task_runner), | 60 : AudioManagerBase(std::move(audio_thread), audio_log_factory), |
63 std::move(worker_task_runner), | |
64 audio_log_factory), | |
65 communication_mode_is_on_(false), | 61 communication_mode_is_on_(false), |
66 output_volume_override_set_(false), | 62 output_volume_override_set_(false), |
67 output_volume_override_(0) { | 63 output_volume_override_(0) { |
68 SetMaxOutputStreamsAllowed(kMaxOutputStreams); | 64 SetMaxOutputStreamsAllowed(kMaxOutputStreams); |
69 } | 65 } |
70 | 66 |
71 AudioManagerAndroid::~AudioManagerAndroid() { | 67 AudioManagerAndroid::~AudioManagerAndroid() = default; |
72 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); | |
73 Shutdown(); | |
74 | |
75 if (j_audio_manager_.is_null()) | |
76 return; | |
77 DVLOG(2) << "Destroying Java part of the audio manager"; | |
78 Java_AudioManagerAndroid_close(base::android::AttachCurrentThread(), | |
79 j_audio_manager_); | |
80 j_audio_manager_.Reset(); | |
81 } | |
82 | 68 |
83 void AudioManagerAndroid::InitializeIfNeeded() { | 69 void AudioManagerAndroid::InitializeIfNeeded() { |
84 GetTaskRunner()->PostTask( | 70 GetTaskRunner()->PostTask( |
85 FROM_HERE, | 71 FROM_HERE, |
86 base::Bind(base::IgnoreResult(&AudioManagerAndroid::GetJavaAudioManager), | 72 base::Bind(base::IgnoreResult(&AudioManagerAndroid::GetJavaAudioManager), |
87 base::Unretained(this))); | 73 base::Unretained(this))); |
88 } | 74 } |
89 | 75 |
76 void AudioManagerAndroid::ShutdownOnAudioThread() { | |
77 AudioManagerBase::ShutdownOnAudioThread(); | |
78 | |
79 if (!j_audio_manager_.is_null()) { | |
o1ka
2017/05/10 15:57:56
Add a comment why we must do it now on audio threa
alokp
2017/05/10 18:04:03
Done.
| |
80 DVLOG(2) << "Destroying Java part of the audio manager"; | |
81 Java_AudioManagerAndroid_close(base::android::AttachCurrentThread(), | |
82 j_audio_manager_); | |
83 j_audio_manager_.Reset(); | |
84 } | |
85 } | |
86 | |
90 bool AudioManagerAndroid::HasAudioOutputDevices() { | 87 bool AudioManagerAndroid::HasAudioOutputDevices() { |
91 return true; | 88 return true; |
92 } | 89 } |
93 | 90 |
94 bool AudioManagerAndroid::HasAudioInputDevices() { | 91 bool AudioManagerAndroid::HasAudioInputDevices() { |
95 return true; | 92 return true; |
96 } | 93 } |
97 | 94 |
98 void AudioManagerAndroid::GetAudioInputDeviceNames( | 95 void AudioManagerAndroid::GetAudioInputDeviceNames( |
99 AudioDeviceNames* device_names) { | 96 AudioDeviceNames* device_names) { |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
424 output_volume_override_ = volume; | 421 output_volume_override_ = volume; |
425 | 422 |
426 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); | 423 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
427 for (OutputStreams::iterator it = streams_.begin(); | 424 for (OutputStreams::iterator it = streams_.begin(); |
428 it != streams_.end(); ++it) { | 425 it != streams_.end(); ++it) { |
429 (*it)->SetVolume(volume); | 426 (*it)->SetVolume(volume); |
430 } | 427 } |
431 } | 428 } |
432 | 429 |
433 } // namespace media | 430 } // namespace media |
OLD | NEW |