OSDN Git Service

Use audio_format_t consistently
authorGlenn Kasten <gkasten@google.com>
Wed, 4 Jan 2012 17:41:53 +0000 (09:41 -0800)
committerGlenn Kasten <gkasten@google.com>
Wed, 4 Jan 2012 17:48:44 +0000 (09:48 -0800)
Change-Id: I81bfafb1fcb374a100b156d9c52771a4b2eb2943

wilhelm/src/android/android_sles_conversions.h

index ebef1e6..b818cc4 100644 (file)
@@ -44,7 +44,7 @@ static inline uint32_t sles_to_android_sampleRate(SLuint32 sampleRateMilliHertz)
     return (uint32_t)(sampleRateMilliHertz / 1000);
 }
 
-static inline int sles_to_android_sampleFormat(SLuint32 pcmFormat) {
+static inline audio_format_t sles_to_android_sampleFormat(SLuint32 pcmFormat) {
     switch (pcmFormat) {
         case SL_PCMSAMPLEFORMAT_FIXED_16:
             return AUDIO_FORMAT_PCM_16_BIT;