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

Commit 064697a2 authored by David Li's avatar David Li Committed by Andy Hung
Browse files

add support more PCM encoding and avoid overwriting audio format 

 - add 32 bit PCM and 24 bit packed PCM format conversion.
 - avoid overwriting audio format in the PCM offloading case

Bug: 357483620
Test: PCM offload playback
Flag: EXEMPT bugfix
Merged-In: Ia93aebb192b5ed6b3e315dbc962cfb11a1cb66b5
Change-Id: Ia93aebb192b5ed6b3e315dbc962cfb11a1cb66b5
parent f7b45622

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 "