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

Commit d02c6b7f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev 

am: 56055c0b

Change-Id: I13e7bb5017914bc3cc2b4113083fb406c137e11f
parents d0904313 56055c0b

core/jni/android_media_AudioFormat.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ static inline audio_format_t audioFormatToNative(int audioFormat) 
    case ENCODING_AAC_ELD:

    case ENCODING_AAC_ELD:

        return AUDIO_FORMAT_AAC_ELD;

        return AUDIO_FORMAT_AAC_ELD;

    case ENCODING_AAC_XHE:

    case ENCODING_AAC_XHE:

        return AUDIO_FORMAT_AAC; // FIXME temporary value, needs addition of xHE-AAC

        return AUDIO_FORMAT_AAC_XHE;

    case ENCODING_AC4:

    case ENCODING_AC4:

        return AUDIO_FORMAT_AC4;

        return AUDIO_FORMAT_AC4;

    case ENCODING_E_AC3_JOC:

    case ENCODING_E_AC3_JOC: