From 0145bf600a8f5fa911170f8bb8c2ff6fec47a599 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 14 Dec 2015 01:24:54 -0800
Subject: stagefright: Additional fixes for extended offload support

 * Fix compilation with debug enabled
 * Allow FLAC offload to be enabled independent of QCOM_HARDWARE,
   tested with the Nexus 5X and is working!
 * Disable the FLACExtractor if offload is enabled since it can
   only output decoded PCM. This will force FFMPEG to be used,
   which does everything we need for FLAC offload

Change-Id: I7d71c153a6a6ea7df8e32bc73f5cbe9f51cdcf64
---
 media/libavextensions/Android.mk              | 4 ++--
 media/libavextensions/stagefright/AVUtils.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'media/libavextensions')

diff --git a/media/libavextensions/Android.mk b/media/libavextensions/Android.mk
index 8099ad4..68c36d8 100644
--- a/media/libavextensions/Android.mk
+++ b/media/libavextensions/Android.mk
@@ -17,15 +17,15 @@ LOCAL_C_INCLUDES:= \
 
 LOCAL_CFLAGS += -Wno-multichar -Werror
 
-ifeq ($(call is-vendor-board-platform,QCOM),true)
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio
+
 ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)
        LOCAL_CFLAGS += -DENABLE_AV_ENHANCEMENTS
 endif
+
 ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true)
        LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED
 endif
-endif
 
 LOCAL_MODULE:= libavextensions
 LOCAL_CFLAGS += -DLOG_NDEBUG=0
diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp
index b17ab2e..db4bc69 100644
--- a/media/libavextensions/stagefright/AVUtils.cpp
+++ b/media/libavextensions/stagefright/AVUtils.cpp
@@ -42,7 +42,7 @@
 #include <media/stagefright/MPEG4Writer.h>
 #include <media/stagefright/Utils.h>
 
-#ifdef QCOM_HARDWARE
+#if defined(QCOM_HARDWARE) || defined(FLAC_OFFLOAD_ENABLED)
 #include "QCMediaDefs.h"
 #include "QCMetaData.h"
 #ifdef FLAC_OFFLOAD_ENABLED
@@ -97,13 +97,13 @@ static const MetaKeyEntry MetaKeyTable[] {
    {kKeyUseArbitraryMode     , "use-arbitrary-mode"     , INT32},  //bool (int32_t)
    {kKeySmoothStreaming      , "smooth-streaming"       , INT32},  //bool (int32_t)
    {kKeyHFR                  , "hfr"                    , INT32},  // int32_t
+#endif
 #ifdef FLAC_OFFLOAD_ENABLED
    {kKeyMinBlkSize           , "min-block-size"         , INT32},
    {kKeyMaxBlkSize           , "max-block-size"         , INT32},
    {kKeyMinFrmSize           , "min-frame-size"         , INT32},
    {kKeyMaxFrmSize           , "max-frame-size"         , INT32},
 #endif
-#endif
 
 
    {kKeyBitRate              , "bitrate"                , INT32},
-- 
cgit v1.1