commit 27e12d6864c6f2cbf56c426cea0787e2de31eff4
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> Fri Sep 21 10:52:05 2018 +0900
committer Tomoharu Kasahara <Tomoharu.Kasahara@sony.com> Fri Sep 21 03:01:37 2018 +0000
tree 0e74a6f2fd3d703599bb9062273a16e1cc911518
parent db44c5d13b9972a0d0dd177c31259b74bc2e4376

Fix codec output format for conversion

Pcm encoding for conversion is wrong so that conversion
does not work as intended.
This CL is fix to use pcm encoding for codec output
properly.

Bug: 116251193
Test: Check format after conversion
Change-Id: I9be62c05d3f25d769c81b200fd229f6943cd234b

media/libstagefright/ACodec.cpp

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 7f39d10..ead05a3 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5383,7 +5383,7 @@
         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) {