summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx
diff options
context:
space:
mode:
authorSharad Sangle <assangle@codeaurora.org>2015-07-16 02:55:47 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:11 -0600
commit3757661864d0e39d98598d06071d542af5af3bbd (patch)
treed11ddc684ebb883695b147d1d0a0054379bf37a3 /media/libstagefright/omx
parentaeb382ad2336837155f3288facc9c415ccc2bfa5 (diff)
downloadframeworks_av-3757661864d0e39d98598d06071d542af5af3bbd.zip
frameworks_av-3757661864d0e39d98598d06071d542af5af3bbd.tar.gz
frameworks_av-3757661864d0e39d98598d06071d542af5af3bbd.tar.bz2
audio: add support for FLAC decoding
added support for FLAC decoding Change-Id: Ia35b0b9218fdf2584348a2a95bf0401c5065dedc
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r--media/libstagefright/omx/Android.mk6
-rwxr-xr-xmedia/libstagefright/omx/SoftOMXPlugin.cpp3
2 files changed, 9 insertions, 0 deletions
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk
index 5f0f567..d16d5df 100644
--- a/media/libstagefright/omx/Android.mk
+++ b/media/libstagefright/omx/Android.mk
@@ -30,6 +30,12 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation \
libdl
+ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)
+ LOCAL_CFLAGS += -DQTI_FLAC_DECODER
+endif
+endif
+
LOCAL_MODULE:= libstagefright_omx
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CLANG := true
diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp
index 0f9c00c..9389f67 100755
--- a/media/libstagefright/omx/SoftOMXPlugin.cpp
+++ b/media/libstagefright/omx/SoftOMXPlugin.cpp
@@ -59,6 +59,9 @@ static const struct {
{ "OMX.google.raw.decoder", "rawdec", "audio_decoder.raw" },
{ "OMX.google.flac.encoder", "flacenc", "audio_encoder.flac" },
{ "OMX.google.gsm.decoder", "gsmdec", "audio_decoder.gsm" },
+#ifdef QTI_FLAC_DECODER
+ { "OMX.qti.audio.decoder.flac", "flacdec", "audio_decoder.flac" },
+#endif
};
static const size_t kNumComponents =