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

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

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
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_AUDIO_TRACK_OUTPUT_ANDROID_H_ 5 #ifndef MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_
6 #define MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_ 6 #define MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/timer.h" 13 #include "base/timer.h"
14 #include "media/audio/audio_io.h" 14 #include "media/audio/audio_io.h"
15 #include "media/audio/audio_parameters.h" 15 #include "media/audio/audio_parameters.h"
16 16
17 namespace media {
18
19 class AudioManagerAndroid; 17 class AudioManagerAndroid;
20 18
21 // Implements PCM audio output support for Android using the AudioTrack API. 19 // Implements PCM audio output support for Android using the AudioTrack API.
22 class AudioTrackOutputStream : public AudioOutputStream { 20 class AudioTrackOutputStream : public AudioOutputStream {
23 public: 21 public:
24 enum Status { 22 enum Status {
25 IDLE, 23 IDLE,
26 OPENED, 24 OPENED,
27 PLAYING, 25 PLAYING,
28 INVALID 26 INVALID
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 61
64 // Java AudioTrack class and instance. 62 // Java AudioTrack class and instance.
65 jclass j_class_; 63 jclass j_class_;
66 jobject j_audio_track_; 64 jobject j_audio_track_;
67 65
68 base::RepeatingTimer<AudioTrackOutputStream> timer_; 66 base::RepeatingTimer<AudioTrackOutputStream> timer_;
69 67
70 DISALLOW_COPY_AND_ASSIGN(AudioTrackOutputStream); 68 DISALLOW_COPY_AND_ASSIGN(AudioTrackOutputStream);
71 }; 69 };
72 70
73 } // namespace media
74
75 #endif // MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_ 71 #endif // MEDIA_AUDIO_ANDROID_AUDIO_TRACK_OUTPUT_ANDROID_H_
OLDNEW
« no previous file with comments | « media/audio/android/audio_manager_android.cc ('k') | media/audio/android/audio_track_output_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698