Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(787)

Side by Side Diff: media/audio/android/opensles_output.h

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <vector> 8 #include <SLES/OpenSLES.h>
9 #include <SLES/OpenSLES_Android.h>
10 #include <SLES/OpenSLES_AndroidConfiguration.h>
9 11
12 #include "base/android/jni_android.h"
Yaron 2013/03/11 21:56:50 This include isn't needed anymore, right?
leozwang1 2013/03/12 22:23:00 Done.
10 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
11 #include "media/audio/android/opensles_util.h" 14 #include "media/audio/android/opensles_util.h"
12 #include "media/audio/audio_io.h" 15 #include "media/audio/audio_io.h"
13 #include "media/audio/audio_parameters.h" 16 #include "media/audio/audio_parameters.h"
14 #include <SLES/OpenSLES_Android.h>
15 17
16 namespace media { 18 namespace media {
17 19
18 class AudioManagerAndroid; 20 class AudioManagerAndroid;
19 21
20 // Implements PCM audio output support for Android using the OpenSLES API. 22 // Implements PCM audio output support for Android using the OpenSLES API.
21 class OpenSLESOutputStream : public AudioOutputStream { 23 class OpenSLESOutputStream : public AudioOutputStream {
22 public: 24 public:
23 static const int kNumOfQueuesInBuffer = 2; 25 static const int kNumOfQueuesInBuffer = 2;
24 26
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 84
83 // Container for retrieving data from AudioSourceCallback::OnMoreData(). 85 // Container for retrieving data from AudioSourceCallback::OnMoreData().
84 scoped_ptr<AudioBus> audio_bus_; 86 scoped_ptr<AudioBus> audio_bus_;
85 87
86 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream); 88 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream);
87 }; 89 };
88 90
89 } // namespace media 91 } // namespace media
90 92
91 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_ 93 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698