diff options
| -rw-r--r-- | media/libavextensions/Android.mk | 4 | ||||
| -rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/StreamingSource.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/Utils.cpp | 3 | ||||
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/Android.mk | 2 |
8 files changed, 14 insertions, 7 deletions
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}, diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp index 43a1b27..136eda5 100644 --- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp +++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp @@ -29,6 +29,7 @@ #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> +#include <inttypes.h> namespace android { diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 381ef6c..efd1a30 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -178,10 +178,11 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true) LOCAL_CFLAGS += -DQTI_FLAC_DECODER endif +endif + ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true) LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED endif -endif LOCAL_CLANG := true diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 8b49d18..f32bb7e 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -232,7 +232,9 @@ void DataSource::RegisterDefaultSniffers() { RegisterSniffer_l(SniffMatroska); RegisterSniffer_l(SniffOgg); RegisterSniffer_l(SniffWAV); +#ifndef FLAC_OFFLOAD_ENABLED RegisterSniffer_l(SniffFLAC); +#endif RegisterSniffer_l(SniffAMR); RegisterSniffer_l(SniffMPEG2TS); RegisterSniffer_l(SniffMP3); diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index fc96e2f..cd0acfa 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -117,8 +117,10 @@ retry: } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB) || !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_WB)) { ret = new AMRExtractor(source); +#ifndef FLAC_OFFLOAD_ENABLED } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) { ret = new FLACExtractor(source); +#endif } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WAV)) { ret = new WAVExtractor(source); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_OGG)) { diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index a50d02d..e9d585f 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -791,6 +791,9 @@ static const struct mime_conv_t mimeLookup[] = { { MEDIA_MIMETYPE_AUDIO_AAC, AUDIO_FORMAT_AAC }, { MEDIA_MIMETYPE_AUDIO_VORBIS, AUDIO_FORMAT_VORBIS }, { MEDIA_MIMETYPE_AUDIO_OPUS, AUDIO_FORMAT_OPUS}, +#ifdef FLAC_OFFLOAD_ENABLED + { MEDIA_MIMETYPE_AUDIO_FLAC, AUDIO_FORMAT_FLAC}, +#endif { 0, AUDIO_FORMAT_INVALID } }; diff --git a/services/audiopolicy/common/managerdefinitions/Android.mk b/services/audiopolicy/common/managerdefinitions/Android.mk index 8c6a53c..f88b72c 100644 --- a/services/audiopolicy/common/managerdefinitions/Android.mk +++ b/services/audiopolicy/common/managerdefinitions/Android.mk @@ -31,7 +31,6 @@ LOCAL_C_INCLUDES += \ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/include -ifeq ($(call is-vendor-board-platform,QCOM),true) ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD)),true) LOCAL_CFLAGS += -DFLAC_OFFLOAD_ENABLED endif @@ -50,7 +49,6 @@ endif ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD)),true) LOCAL_CFLAGS += -DAAC_ADTS_OFFLOAD_ENABLED endif -endif LOCAL_MODULE := libaudiopolicycomponents |