summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorvivek mehta <mvivek@codeaurora.org>2015-07-16 12:56:57 -0700
committerSatish Kamuju <skamuj@codeaurora.org>2015-10-06 17:36:46 +0530
commitbc3028750d3438ebf108298e93f12de461f56430 (patch)
tree20081f78f461ee05b8a1c2cf842387ca3c89f4e5 /services/audiopolicy
parent9953765019ae2243e98e8e74eee327c9893b93d1 (diff)
downloadframeworks_av-bc3028750d3438ebf108298e93f12de461f56430.zip
frameworks_av-bc3028750d3438ebf108298e93f12de461f56430.tar.gz
frameworks_av-bc3028750d3438ebf108298e93f12de461f56430.tar.bz2
stagefright: Add support for custom size i/p buffer
- handle non default input buffer size - fix issues associated with non-default buffer size Change-Id: Iad31f5c85601983b01e18e130b1c3eecb3988e30
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/common/managerdefinitions/Android.mk3
-rw-r--r--services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h12
2 files changed, 15 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/Android.mk b/services/audiopolicy/common/managerdefinitions/Android.mk
index 10362f4..8c6a53c 100644
--- a/services/audiopolicy/common/managerdefinitions/Android.mk
+++ b/services/audiopolicy/common/managerdefinitions/Android.mk
@@ -47,6 +47,9 @@ endif
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_APE_OFFLOAD)),true)
LOCAL_CFLAGS += -DAPE_OFFLOAD_ENABLED
endif
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD)),true)
+LOCAL_CFLAGS += -DAAC_ADTS_OFFLOAD_ENABLED
+endif
endif
LOCAL_MODULE := libaudiopolicycomponents
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
index cc91c63..4a394bb 100644
--- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
+++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h
@@ -217,6 +217,18 @@ const StringToEnum sFormatNameToEnumTable[] = {
#ifdef APE_OFFLOAD_ENABLED
STRING_TO_ENUM(AUDIO_FORMAT_APE),
#endif
+#ifdef AAC_ADTS_OFFLOAD_ENABLED
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_MAIN),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_LC),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_SSR),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_LTP),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_HE_V1),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_SCALABLE),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_ERLC),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_LD),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_HE_V2),
+ STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADTS_ELD),
+#endif
};
const StringToEnum sOutChannelsNameToEnumTable[] = {