diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 09:51:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 09:51:00 -0700 |
| commit | e9847f9d84b7c04a739e1741c7d59a63a80e782e (patch) | |
| tree | 82baaa1229f389e27208fc9dcbec2ca7ed200c68 /WebKit | |
| parent | 5c8f5ddce8a8440c7c0e9e805e55964e4d4f3b93 (diff) | |
| parent | beeaff31cb168d09ed9157d08b1ef161d738a285 (diff) | |
| download | external_webkit-e9847f9d84b7c04a739e1741c7d59a63a80e782e.zip external_webkit-e9847f9d84b7c04a739e1741c7d59a63a80e782e.tar.gz external_webkit-e9847f9d84b7c04a739e1741c7d59a63a80e782e.tar.bz2 | |
Merge change 7734
* changes:
Fix issue 1795088 Improve audio routing code
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/plugins/ANPSoundInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/plugins/ANPSoundInterface.cpp b/WebKit/android/plugins/ANPSoundInterface.cpp index 6b019d1..c4bec1c 100644 --- a/WebKit/android/plugins/ANPSoundInterface.cpp +++ b/WebKit/android/plugins/ANPSoundInterface.cpp @@ -46,7 +46,7 @@ static ANPSampleFormat toANPFormat(int fm) { } } -static android::AudioSystem::audio_format fromANPFormat(ANPSampleFormat fm) { +static int fromANPFormat(ANPSampleFormat fm) { switch (fm) { case kPCM16Bit_ANPSampleFormat: return android::AudioSystem::PCM_16_BIT; @@ -97,7 +97,7 @@ static ANPAudioTrack* ANPCreateTrack(uint32_t sampleRate, track->mTrack = new android::AudioTrack(android::AudioSystem::MUSIC, sampleRate, fromANPFormat(format), - channelCount, + (channelCount > 1) ? android::AudioSystem::CHANNEL_OUT_STEREO : android::AudioSystem::CHANNEL_OUT_MONO, 0, // frameCount 0, // flags callbackProc, |