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

Commit febf33cb authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "add support more PCM encoding and avoid overwriting audio format" into main am: ed1d33f3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3342129



Change-Id: I181b5dc61bdcc90c39584fc50942dd43fcbffbf0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 723135a1 ed1d33f3

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+10 −1
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ static audio_format_t constexpr audioFormatFromEncoding(int32_t pcmEncoding) { 
    switch (pcmEncoding) {

    case kAudioEncodingPcmFloat:

        return AUDIO_FORMAT_PCM_FLOAT;

    case kAudioEncodingPcm32bit:

        return AUDIO_FORMAT_PCM_32_BIT;

    case kAudioEncodingPcm24bitPacked:

        return AUDIO_FORMAT_PCM_24_BIT_PACKED;

    case kAudioEncodingPcm16bit:

        return AUDIO_FORMAT_PCM_16_BIT;

    case kAudioEncodingPcm8bit:
@@ -2028,7 +2032,12 @@ status_t NuPlayer::Renderer::onOpenAudioSink( 
    if (offloadingAudio()) {

        AString mime;

        CHECK(format->findString("mime", &mime));

        status_t err = mapMimeToAudioFormat(audioFormat, mime.c_str());

        status_t err = OK;

        if (audioFormat == AUDIO_FORMAT_PCM_16_BIT) {

            // If there is probably no pcm-encoding in the format message, try to get the format by

            // its mimetype.

            err = mapMimeToAudioFormat(audioFormat, mime.c_str());

        }



        if (err != OK) {

            ALOGE("Couldn't map mime \"%s\" to a valid "