diff options
| author | Dima Zavin <dima@android.com> | 2011-04-05 16:03:58 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-04-19 23:12:29 -0700 |
| commit | ae523aafcb7b5f04cd5ad61ab37e546ca7ca6df2 (patch) | |
| tree | 9177650f8992883105ba0ac5dbbfdd71e4c4c4fd /WebKit/android | |
| parent | 1360c55ddd4e5ce56a558c055de5b09d250c51b4 (diff) | |
| download | external_webkit-ae523aafcb7b5f04cd5ad61ab37e546ca7ca6df2.zip external_webkit-ae523aafcb7b5f04cd5ad61ab37e546ca7ca6df2.tar.gz external_webkit-ae523aafcb7b5f04cd5ad61ab37e546ca7ca6df2.tar.bz2 | |
webkit: convert to use new audio.h
Change-Id: I2754c4fdf8a367530e2be5c215e5a3823e4957c5
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/plugins/ANPSoundInterface.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/WebKit/android/plugins/ANPSoundInterface.cpp b/WebKit/android/plugins/ANPSoundInterface.cpp index 91778e3..c109880 100644 --- a/WebKit/android/plugins/ANPSoundInterface.cpp +++ b/WebKit/android/plugins/ANPSoundInterface.cpp @@ -30,6 +30,8 @@ #include "SkTypes.h" #include "media/AudioTrack.h" +#include <hardware/audio.h> + struct ANPAudioTrack { void* mUser; ANPAudioCallbackProc mProc; @@ -38,9 +40,9 @@ struct ANPAudioTrack { static ANPSampleFormat toANPFormat(int fm) { switch (fm) { - case android::AudioSystem::PCM_16_BIT: + case AUDIO_FORMAT_PCM_16_BIT: return kPCM16Bit_ANPSampleFormat; - case android::AudioSystem::PCM_8_BIT: + case AUDIO_FORMAT_PCM_8_BIT: return kPCM8Bit_ANPSampleFormat; default: return kUnknown_ANPSamleFormat; @@ -50,11 +52,11 @@ static ANPSampleFormat toANPFormat(int fm) { static int fromANPFormat(ANPSampleFormat fm) { switch (fm) { case kPCM16Bit_ANPSampleFormat: - return android::AudioSystem::PCM_16_BIT; + return AUDIO_FORMAT_PCM_16_BIT; case kPCM8Bit_ANPSampleFormat: - return android::AudioSystem::PCM_8_BIT; + return AUDIO_FORMAT_PCM_8_BIT; default: - return android::AudioSystem::INVALID_FORMAT; + return AUDIO_FORMAT_INVALID; } } @@ -95,10 +97,10 @@ static ANPAudioTrack* ANPCreateTrack(uint32_t sampleRate, track->mUser = user; track->mProc = proc; - track->mTrack = new android::AudioTrack(android::AudioSystem::MUSIC, + track->mTrack = new android::AudioTrack(AUDIO_STREAM_MUSIC, sampleRate, fromANPFormat(format), - (channelCount > 1) ? android::AudioSystem::CHANNEL_OUT_STEREO : android::AudioSystem::CHANNEL_OUT_MONO, + (channelCount > 1) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO, 0, // frameCount 0, // flags callbackProc, |