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> |
|
Ami GONE FROM CHROMIUM
2013/03/22 16:24:41
nit: Are these includes really necessary?
Aren't t
leozwang1
2013/03/22 21:37:09
We need these two. opensles_util.h #include <SLES/
Ami GONE FROM CHROMIUM
2013/03/22 22:29:55
Isn't this (<SLES/OpenSLES.h>) one of the two here
leozwang1
2013/03/22 22:44:48
If I comment out #include <SLES/OpenSLES.h>, I wil
Ami GONE FROM CHROMIUM
2013/03/22 23:34:20
OIC the problem is that you're including OpenSLES_
| |
| 10 #include <SLES/OpenSLES_AndroidConfiguration.h> | |
| 11 | 10 |
| 12 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 13 #include "media/audio/android/opensles_util.h" | 12 #include "media/audio/android/opensles_util.h" |
| 14 #include "media/audio/audio_io.h" | 13 #include "media/audio/audio_io.h" |
| 15 #include "media/audio/audio_parameters.h" | 14 #include "media/audio/audio_parameters.h" |
| 16 | 15 |
| 17 namespace media { | 16 namespace media { |
| 18 | 17 |
| 19 class AudioManagerAndroid; | 18 class AudioManagerAndroid; |
| 20 | 19 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 | 82 |
| 84 // Container for retrieving data from AudioSourceCallback::OnMoreData(). | 83 // Container for retrieving data from AudioSourceCallback::OnMoreData(). |
| 85 scoped_ptr<AudioBus> audio_bus_; | 84 scoped_ptr<AudioBus> audio_bus_; |
| 86 | 85 |
| 87 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream); | 86 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream); |
| 88 }; | 87 }; |
| 89 | 88 |
| 90 } // namespace media | 89 } // namespace media |
| 91 | 90 |
| 92 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ | 91 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ |
| OLD | NEW |