media/audio/android/opensles_output.h - Issue 10832285: Switch OnMoreData() to use AudioBus.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10832285: Switch OnMoreData() to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Comments. Use actual frame count for PPAPI. Created 8 years, 3 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:

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 <vector>	8 #include <vector>

9	9

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 uint8* audio_data_[kNumOfQueuesInBuffer];	73 uint8* audio_data_[kNumOfQueuesInBuffer];

74	74

75 int active_queue_;	75 int active_queue_;

76 size_t buffer_size_bytes_;	76 size_t buffer_size_bytes_;

77	77

78 bool started_;	78 bool started_;

79	79

80 // Volume level from 0 to 1.	80 // Volume level from 0 to 1.

81 float volume_;	81 float volume_;

82	82

	83 // Container for retrieving data from AudioSourceCallback::OnMoreData().

	84 scoped_ptr<AudioBus> audio_bus_;

	85

83 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream);	86 DISALLOW_COPY_AND_ASSIGN(OpenSLESOutputStream);

84 };	87 };

85	88

86 } // namespace media	89 } // namespace media

87	90

88 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_	91 #endif // MEDIA_AUDIO_ANDROID_OPENSLES_INPUT_H_

OLD	NEW