media/audio/android/opensles_output.cc - Issue 10855218: Correct channel mask on android

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

Unified Diff: media/audio/android/opensles_output.cc

Issue 10855218: Correct channel mask on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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:

Index: media/audio/android/opensles_output.cc

diff --git a/media/audio/android/opensles_output.cc b/media/audio/android/opensles_output.cc

index 7a4b68b3bd3d87f2a14bdb80b49e86a7ba3c14ae..538382b2a9b8c795ff92708da5cbf69db68448fc 100644

--- a/media/audio/android/opensles_output.cc

+++ b/media/audio/android/opensles_output.cc

@@ -26,8 +26,13 @@ OpenSLESOutputStream::OpenSLESOutputStream(AudioManagerAndroid* manager,

format_.samplesPerSec = static_cast<SLuint32>(params.sample_rate() * 1000);

format_.bitsPerSample = params.bits_per_sample();

format_.containerSize = params.bits_per_sample();

- format_.channelMask = SL_SPEAKER_FRONT_CENTER;

format_.endianness = SL_BYTEORDER_LITTLEENDIAN;

+ if (format_.numChannels == 1)

+ format_.channelMask = SL_SPEAKER_FRONT_CENTER;

+ else if (format_.numChannels == 2)

+ format_.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;

+ else

+ NOTREACHED() << "Unsupported channel " << format_.numChannels;

Raymond Toy (Google) 2012/08/17 16:14:33 Nit: I would say "Unsupported number of channels:

scherkus (not reviewing) 2012/08/17 17:47:12 ditto

buffer_size_bytes_ = params.GetBytesPerBuffer();