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

Commit ebfaafc6 authored by Satya Krishna Pindiproli's avatar Satya Krishna Pindiproli Committed by Steve Kondik
Browse files

ACodec: Initialize numChannels and sampleRate for flac codec 

Initialize numChannels and sampleRate before setting up flac codec
to avoid junk values being passed. Ensure that setupRawAudioFormat
is configured only for input index for Flac as raw decoder just copies
the input to the output port for flac decoding.

CRs-Fixed: 776723
Change-Id: I911cf9201a416372da504412d8c917fbaaca4b2b
parent e42e5aa7

media/libstagefright/ACodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1589,7 +1589,7 @@ status_t ACodec::configureCodec( 
            err = setupG711Codec(encoder, numChannels);

        }

    } else if (encoder && !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) {

        int32_t numChannels, sampleRate, compressionLevel = -1;

        int32_t numChannels = 0, sampleRate = 0, compressionLevel = -1;

        if (!msg->findInt32("channel-count", &numChannels)

                    || !msg->findInt32("sample-rate", &sampleRate)) {

            ALOGE("missing channel count or sample rate for FLAC encoder");
@@ -2049,7 +2049,7 @@ status_t ACodec::setupFlacCodec( 
    }



    return setupRawAudioFormat(

            encoder ? kPortIndexInput : kPortIndexOutput,

            kPortIndexInput,

            sampleRate,

            numChannels, bitsPerSample);

}