commit 31ebb41bf01ef2542e51365b8d16d8fcd7c20225
author Phil Burk <philburk@google.com> Thu Apr 02 23:10:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 02 23:10:23 2015 +0000
tree 1944d104e56d77de94022685445552fa5cce7728
parent a2825e141c1a1d831f864c420d38f0c664e33dce
parent fa7a30a5fa26c60dcc8218708107d4e302230eeb

Merge "audio.h: add AUDIO_FORMAT_DTS"

include/system/audio.h

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 @@
     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 @@
     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 @@
     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;