Chromium Code Reviews| 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 #ifndef MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ | 5 #ifndef MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ |
| 6 #define MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ | 6 #define MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ |
| 7 | 7 |
| 8 #include <SLES/OpenSLES.h> | 8 #include <SLES/OpenSLES.h> |
| 9 #include <SLES/OpenSLES_Android.h> | 9 #include <SLES/OpenSLES_Android.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 111 // Volume control coming from hardware. It overrides |volume_| when it's | 111 // Volume control coming from hardware. It overrides |volume_| when it's |
| 112 // true. Otherwise, use |volume_| for scaling. | 112 // true. Otherwise, use |volume_| for scaling. |
| 113 // This is needed because platform voice volume never goes to zero in | 113 // This is needed because platform voice volume never goes to zero in |
| 114 // COMMUNICATION mode on Android. | 114 // COMMUNICATION mode on Android. |
| 115 bool muted_; | 115 bool muted_; |
| 116 | 116 |
| 117 // Volume level from 0 to 1. | 117 // Volume level from 0 to 1. |
| 118 float volume_; | 118 float volume_; |
| 119 | 119 |
| 120 // Container for retrieving data from AudioSourceCallback::OnMoreData(). | 120 // Container for retrieving data from AudioSourceCallback::OnMoreData(). |
| 121 scoped_ptr<AudioBus> audio_bus_; | 121 std::unique_ptr<AudioBus> audio_bus_; |
|
danakj
2016/04/22 22:47:35
include memory
dcheng
2016/04/22 23:13:19
Done.
| |
| 122 | 122 |
| 123 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream); | 123 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream); |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 } // namespace media | 126 } // namespace media |
| 127 | 127 |
| 128 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ | 128 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_ |
| OLD | NEW |