diff options
| author | Phil Burk <philburk@google.com> | 2015-04-02 23:10:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 23:10:23 +0000 |
| commit | 7c6f796df4f12d4a2b7b5ccca73d52827a7a9567 (patch) | |
| tree | 1944d104e56d77de94022685445552fa5cce7728 /include/system | |
| parent | ee90e13b5dc245ebd7a477727e012a52f679fbe2 (diff) | |
| parent | 103c2d22035b294b7cbbb5b5a7216a7d0cce9769 (diff) | |
| download | system_core-7c6f796df4f12d4a2b7b5ccca73d52827a7a9567.zip system_core-7c6f796df4f12d4a2b7b5ccca73d52827a7a9567.tar.gz system_core-7c6f796df4f12d4a2b7b5ccca73d52827a7a9567.tar.bz2 | |
Merge "audio.h: add AUDIO_FORMAT_DTS"
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 04252e7..2a85de1 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -234,6 +234,7 @@ typedef enum { AUDIO_FORMAT_VORBIS_SUB_NONE = 0x0, } audio_format_vorbis_sub_fmt_t; + /* Audio format consists of a main format field (upper 8 bits) and a sub format * field (lower 24 bits). * @@ -257,6 +258,8 @@ typedef enum { AUDIO_FORMAT_OPUS = 0x08000000UL, AUDIO_FORMAT_AC3 = 0x09000000UL, AUDIO_FORMAT_E_AC3 = 0x0A000000UL, + AUDIO_FORMAT_DTS = 0x0B000000UL, + AUDIO_FORMAT_DTS_HD = 0x0C000000UL, AUDIO_FORMAT_MAIN_MASK = 0xFF000000UL, AUDIO_FORMAT_SUB_MASK = 0x00FFFFFFUL, @@ -1315,6 +1318,8 @@ static inline bool audio_is_valid_format(audio_format_t format) case AUDIO_FORMAT_OPUS: case AUDIO_FORMAT_AC3: case AUDIO_FORMAT_E_AC3: + case AUDIO_FORMAT_DTS: + case AUDIO_FORMAT_DTS_HD: return true; default: return false; |