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

Commit 2c8be3ef authored by Phil Burk's avatar Phil Burk Committed by Android (Google) Code Review
Browse files

Merge "aaudio: remove AAUDIO_FORMAT_PCM_I8_24 and I32" into oc-dev

parents fc59a24f 74733450

media/libaaudio/include/aaudio/AAudio.h

+1 −3
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ enum { 
    AAUDIO_FORMAT_INVALID = -1,

    AAUDIO_FORMAT_UNSPECIFIED = 0,

    AAUDIO_FORMAT_PCM_I16,

    AAUDIO_FORMAT_PCM_FLOAT,

    AAUDIO_FORMAT_PCM_I8_24,

    AAUDIO_FORMAT_PCM_I32

    AAUDIO_FORMAT_PCM_FLOAT

};

typedef int32_t aaudio_format_t;

media/libaaudio/src/binding/AAudioStreamConfiguration.cpp

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ aaudio_result_t AAudioStreamConfiguration::validate() const { 
    switch (mAudioFormat) {

    case AAUDIO_FORMAT_PCM_I16:

    case AAUDIO_FORMAT_PCM_FLOAT:

    case AAUDIO_FORMAT_PCM_I8_24:

    case AAUDIO_FORMAT_PCM_I32:

        break;

    default:

        ALOGE("AAudioStreamConfiguration.validate() invalid audioFormat = %d", mAudioFormat);

media/libaaudio/src/utility/AAudioUtilities.cpp

+0 −16
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ int32_t AAudioConvert_formatToSizeInBytes(aaudio_audio_format_t format) { 
        case AAUDIO_FORMAT_PCM_I16:

            size = sizeof(int16_t);

            break;

        case AAUDIO_FORMAT_PCM_I32:

        case AAUDIO_FORMAT_PCM_I8_24:

            size = sizeof(int32_t);

            break;

        case AAUDIO_FORMAT_PCM_FLOAT:

            size = sizeof(float);

            break;
@@ -135,12 +131,6 @@ audio_format_t AAudioConvert_aaudioToAndroidDataFormat(aaudio_audio_format_t aau 
    case AAUDIO_FORMAT_PCM_FLOAT:

        androidFormat = AUDIO_FORMAT_PCM_FLOAT;

        break;

    case AAUDIO_FORMAT_PCM_I8_24:

        androidFormat = AUDIO_FORMAT_PCM_8_24_BIT;

        break;

    case AAUDIO_FORMAT_PCM_I32:

        androidFormat = AUDIO_FORMAT_PCM_32_BIT;

        break;

    default:

        androidFormat = AUDIO_FORMAT_DEFAULT;

        ALOGE("AAudioConvert_aaudioToAndroidDataFormat 0x%08X unrecognized", aaudioFormat);
@@ -158,12 +148,6 @@ aaudio_audio_format_t AAudioConvert_androidToAAudioDataFormat(audio_format_t and 
    case AUDIO_FORMAT_PCM_FLOAT:

        aaudioFormat = AAUDIO_FORMAT_PCM_FLOAT;

        break;

    case AUDIO_FORMAT_PCM_32_BIT:

        aaudioFormat = AAUDIO_FORMAT_PCM_I32;

        break;

    case AUDIO_FORMAT_PCM_8_24_BIT:

        aaudioFormat = AAUDIO_FORMAT_PCM_I8_24;

        break;

    default:

        aaudioFormat = AAUDIO_FORMAT_INVALID;

        ALOGE("AAudioConvert_androidToAAudioDataFormat 0x%08X unrecognized", androidFormat);