From d9887ccfe9c5838bffc47ee04ac0294ec9e332a8 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Thu, 19 Nov 2015 15:33:02 -0800
Subject: stagefright: ACodec: Correctly handle FLAC port format

* Handle FFMPEG FLAC codecs correctly, otherwise do the default codec
  behavior.

Change-Id: Ib8c1c5037060ff1c5ea0a5317ab190ce2e306c1e
---
 media/libstagefright/ACodec.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'media/libstagefright/ACodec.cpp')

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 213d4e2..a8e4e02 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -4323,7 +4323,13 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
 
                 case OMX_AUDIO_CodingFLAC:
                 {
-                    if (portIndex == kPortIndexInput) {
+                    if (!strncmp(mComponentName.c_str(), "OMX.ffmpeg.", 11)) {
+                        err = FFMPEGSoftCodec::getAudioPortFormat(portIndex,
+                                (int)audioDef->eEncoding, notify, mOMX, mNode);
+                        if (err != OK) {
+                            return err;
+                        }
+                    } else {
                     OMX_AUDIO_PARAM_FLACTYPE params;
                     InitOMXParams(&params);
                     params.nPortIndex = portIndex;
@@ -4337,8 +4343,8 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) {
                     notify->setString("mime", MEDIA_MIMETYPE_AUDIO_FLAC);
                     notify->setInt32("channel-count", params.nChannels);
                     notify->setInt32("sample-rate", params.nSampleRate);
-                    break;
                     }
+                    break;
                 }
 
                 case OMX_AUDIO_CodingMP3:
-- 
cgit v1.1