diff options
| author | Manish Dewangan <manish@codeaurora.org> | 2015-08-24 11:20:49 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:29:25 -0600 |
| commit | 6bbaf563603c1b43de071e7c7a51a274c0f3afc5 (patch) | |
| tree | 2d59a6a976cd3fe72e16a1168d8232c60ac455b0 | |
| parent | 607c7ed6316352d7a966151564a0e7045484457f (diff) | |
| download | android_system_media-6bbaf563603c1b43de071e7c7a51a274c0f3afc5.tar.gz android_system_media-6bbaf563603c1b43de071e7c7a51a274c0f3afc5.tar.bz2 android_system_media-6bbaf563603c1b43de071e7c7a51a274c0f3afc5.zip | |
audio: Add support for AAC ADTS offload
-Add support for AAC ADTS format.
-Parser sends bistream in ADTS format if configure in Byte Stream Mode
Change-Id: I496faf9fb7b7742b674da52ef6f45494f5e3de88
| -rw-r--r-- | audio/include/system/audio.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h index 8aae0e73..34da3fc8 100644 --- a/audio/include/system/audio.h +++ b/audio/include/system/audio.h @@ -276,6 +276,7 @@ typedef enum { AUDIO_FORMAT_FLAC = 0x1B000000UL, AUDIO_FORMAT_ALAC = 0x1C000000UL, AUDIO_FORMAT_APE = 0x1D000000UL, + AUDIO_FORMAT_AAC_ADTS = 0x1E000000UL, AUDIO_FORMAT_MAIN_MASK = 0xFF000000UL, AUDIO_FORMAT_SUB_MASK = 0x00FFFFFFUL, @@ -314,6 +315,26 @@ typedef enum { AUDIO_FORMAT_AAC_SUB_HE_V2), AUDIO_FORMAT_AAC_ELD = (AUDIO_FORMAT_AAC | AUDIO_FORMAT_AAC_SUB_ELD), + AUDIO_FORMAT_AAC_ADTS_MAIN = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_MAIN), + AUDIO_FORMAT_AAC_ADTS_LC = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_LC), + AUDIO_FORMAT_AAC_ADTS_SSR = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_SSR), + AUDIO_FORMAT_AAC_ADTS_LTP = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_LTP), + AUDIO_FORMAT_AAC_ADTS_HE_V1 = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_HE_V1), + AUDIO_FORMAT_AAC_ADTS_SCALABLE = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_SCALABLE), + AUDIO_FORMAT_AAC_ADTS_ERLC = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_ERLC), + AUDIO_FORMAT_AAC_ADTS_LD = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_LD), + AUDIO_FORMAT_AAC_ADTS_HE_V2 = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_HE_V2), + AUDIO_FORMAT_AAC_ADTS_ELD = (AUDIO_FORMAT_AAC_ADTS | + AUDIO_FORMAT_AAC_SUB_ELD), /*Offload PCM formats*/ AUDIO_FORMAT_PCM_16_BIT_OFFLOAD = (AUDIO_FORMAT_PCM_OFFLOAD | AUDIO_FORMAT_PCM_SUB_16_BIT), @@ -1410,6 +1431,7 @@ static inline bool audio_is_valid_format(audio_format_t format) case AUDIO_FORMAT_AMR_NB: case AUDIO_FORMAT_AMR_WB: case AUDIO_FORMAT_AAC: + case AUDIO_FORMAT_AAC_ADTS: case AUDIO_FORMAT_HE_AAC_V1: case AUDIO_FORMAT_HE_AAC_V2: case AUDIO_FORMAT_VORBIS: |