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" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 const int kMaxOutputStreams = 10; | 42 const int kMaxOutputStreams = 10; |
43 | 43 |
44 const int kDefaultInputBufferSize = 1024; | 44 const int kDefaultInputBufferSize = 1024; |
45 const int kDefaultOutputBufferSize = 2048; | 45 const int kDefaultOutputBufferSize = 2048; |
46 | 46 |
47 } // namespace | 47 } // namespace |
48 | 48 |
49 ScopedAudioManagerPtr CreateAudioManager( | 49 ScopedAudioManagerPtr CreateAudioManager( |
50 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 50 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
51 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, | 51 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
52 AudioLogFactory* audio_log_factory) { | 52 AudioLogFactory* audio_log_factory, |
| 53 CreateAudioFileWriterCallback create_audio_file_writer_callback) { |
53 return ScopedAudioManagerPtr(new AudioManagerAndroid( | 54 return ScopedAudioManagerPtr(new AudioManagerAndroid( |
54 std::move(task_runner), std::move(worker_task_runner), | 55 std::move(task_runner), std::move(worker_task_runner), audio_log_factory, |
55 audio_log_factory)); | 56 std::move(create_audio_file_writer_callback))); |
56 } | 57 } |
57 | 58 |
58 AudioManagerAndroid::AudioManagerAndroid( | 59 AudioManagerAndroid::AudioManagerAndroid( |
59 scoped_refptr<base::SingleThreadTaskRunner> task_runner, | 60 scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
60 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, | 61 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner, |
61 AudioLogFactory* audio_log_factory) | 62 AudioLogFactory* audio_log_factory, |
| 63 CreateAudioFileWriterCallback create_audio_file_writer_callback) |
62 : AudioManagerBase(std::move(task_runner), | 64 : AudioManagerBase(std::move(task_runner), |
63 std::move(worker_task_runner), | 65 std::move(worker_task_runner), |
64 audio_log_factory), | 66 audio_log_factory, |
| 67 std::move(create_audio_file_writer_callback)), |
65 communication_mode_is_on_(false), | 68 communication_mode_is_on_(false), |
66 output_volume_override_set_(false), | 69 output_volume_override_set_(false), |
67 output_volume_override_(0) { | 70 output_volume_override_(0) { |
68 SetMaxOutputStreamsAllowed(kMaxOutputStreams); | 71 SetMaxOutputStreamsAllowed(kMaxOutputStreams); |
69 } | 72 } |
70 | 73 |
71 AudioManagerAndroid::~AudioManagerAndroid() { | 74 AudioManagerAndroid::~AudioManagerAndroid() { |
72 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); | 75 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
73 Shutdown(); | 76 Shutdown(); |
74 | 77 |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 output_volume_override_ = volume; | 427 output_volume_override_ = volume; |
425 | 428 |
426 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); | 429 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
427 for (OutputStreams::iterator it = streams_.begin(); | 430 for (OutputStreams::iterator it = streams_.begin(); |
428 it != streams_.end(); ++it) { | 431 it != streams_.end(); ++it) { |
429 (*it)->SetVolume(volume); | 432 (*it)->SetVolume(volume); |
430 } | 433 } |
431 } | 434 } |
432 | 435 |
433 } // namespace media | 436 } // namespace media |
OLD | NEW |