diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 10:30:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 10:30:01 -0800 |
| commit | a0bdcf4b6af8cf34f8421c373f6b19b74e441db9 (patch) | |
| tree | 43fd51ef1d2b43f458459506039c516c433aed09 | |
| parent | fdb7d19f652ba508451312116a466b4dad9c86de (diff) | |
| parent | aec70f340dd665e5c3bf3ef7aed3bae2fe55996d (diff) | |
| download | external_webkit-a0bdcf4b6af8cf34f8421c373f6b19b74e441db9.zip external_webkit-a0bdcf4b6af8cf34f8421c373f6b19b74e441db9.tar.gz external_webkit-a0bdcf4b6af8cf34f8421c373f6b19b74e441db9.tar.bz2 | |
Merge "Use audio_format_t consistently"
| -rw-r--r-- | Source/WebKit/android/plugins/ANPSoundInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/plugins/ANPSoundInterface.cpp b/Source/WebKit/android/plugins/ANPSoundInterface.cpp index c238872..a4f192f 100644 --- a/Source/WebKit/android/plugins/ANPSoundInterface.cpp +++ b/Source/WebKit/android/plugins/ANPSoundInterface.cpp @@ -38,7 +38,7 @@ struct ANPAudioTrack { android::AudioTrack* mTrack; }; -static ANPSampleFormat toANPFormat(int fm) { +static ANPSampleFormat toANPFormat(audio_format_t fm) { switch (fm) { case AUDIO_FORMAT_PCM_16_BIT: return kPCM16Bit_ANPSampleFormat; @@ -49,7 +49,7 @@ static ANPSampleFormat toANPFormat(int fm) { } } -static int fromANPFormat(ANPSampleFormat fm) { +static audio_format_t fromANPFormat(ANPSampleFormat fm) { switch (fm) { case kPCM16Bit_ANPSampleFormat: return AUDIO_FORMAT_PCM_16_BIT; |