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

Commit c5bf17d8 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 

am: 7b8cad4e

Change-Id: I1edec42d5f033edf9d24446ed1866965a1324274
parents 5581d7c6 7b8cad4e

media/libstagefright/ACodec.cpp

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

        AudioEncoding pcmEncoding = kAudioEncodingPcm16bit;

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

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

        AudioEncoding codecPcmEncoding = kAudioEncodingPcm16bit;

        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);

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

        if (mConverter[kPortIndexOutput] != NULL) {

        if (mConverter[kPortIndexOutput] != NULL) {