Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da382248 authored by Eric Laurent's avatar Eric Laurent
Browse files

Fixed some audio helper functions 

Make sure audio_is_valid_format() is true only
for formats supported by AudioTrack and AudioRecord.
Generalized audio_is_linear_pcm().
Added audio_bytes_per_sample() function.

Change-Id: If588af6c08f09796ab04bccbbd6e720f1e914412
parent 9f7ad372

include/system/audio.h

+24 −6
Original line number Diff line number Diff line
@@ -369,6 +369,10 @@ static inline bool audio_is_valid_format(uint32_t format) 
{

    switch (format & AUDIO_FORMAT_MAIN_MASK) {

    case AUDIO_FORMAT_PCM:

        if (format != AUDIO_FORMAT_PCM_16_BIT &&

                format != AUDIO_FORMAT_PCM_8_BIT) {

            return false;

        }

    case AUDIO_FORMAT_MP3:

    case AUDIO_FORMAT_AMR_NB:

    case AUDIO_FORMAT_AMR_WB:
@@ -384,16 +388,30 @@ static inline bool audio_is_valid_format(uint32_t format) 


static inline bool audio_is_linear_pcm(uint32_t format)

{

    return ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM);

}



static inline size_t audio_bytes_per_sample(uint32_t format)

{

    size_t size = 0;



    switch (format) {

        case AUDIO_FORMAT_PCM_32_BIT:

        case AUDIO_FORMAT_PCM_8_24_BIT:

            size = sizeof(int32_t);

            break;

        case AUDIO_FORMAT_PCM_16_BIT:

            size = sizeof(int16_t);

            break;

        case AUDIO_FORMAT_PCM_8_BIT:

        return true;

            size = sizeof(uint8_t);

            break;

        default:

        return false;

            break;

    }

    return size;

}





__END_DECLS



#endif  // ANDROID_AUDIO_CORE_H