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

Commit 7b8cad4e authored by Tomoharu Kasahara's avatar Tomoharu Kasahara Committed by android-build-merger
Browse files

Merge "Fix codec output format for conversion" am: 21d312e7 

am: 44b720db

Change-Id: Idd4a03c69565e2a144678fcc30e39e4fac67012f
parents c05fe5d0 44b720db

media/libstagefright/ACodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5384,7 +5384,7 @@ void ACodec::onOutputFormatChanged(sp<const AMessage> expectedFormat) { 
        AudioEncoding pcmEncoding = kAudioEncodingPcm16bit;

        (void)mConfigFormat->findInt32("pcm-encoding", (int32_t*)&pcmEncoding);

        AudioEncoding codecPcmEncoding = kAudioEncodingPcm16bit;

        (void)mOutputFormat->findInt32("pcm-encoding", (int32_t*)&pcmEncoding);

        (void)mOutputFormat->findInt32("pcm-encoding", (int32_t*)&codecPcmEncoding);



        mConverter[kPortIndexOutput] = AudioConverter::Create(codecPcmEncoding, pcmEncoding);

        if (mConverter[kPortIndexOutput] != NULL) {