diff options
| author | 2019-03-20 14:52:38 -0700 | |
|---|---|---|
| committer | 2019-03-20 15:50:59 -0700 | |
| commit | 6977b323975e5b9a67794a979482656c2d35e245 (patch) | |
| tree | 7dbc30124a15bd785d59fa020488d97beda4a728 | |
| parent | f54473a80beef59c591fa5ca4862ea4019a7a244 (diff) | |
Add key for haptic channel count.
Test: test with files (not) containing haptic channels.
Bug: 128012181
Change-Id: I02438c2b49a2adc7c1643405209877c3747a5558
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 34c2c2942ded..bcc4d0b806f4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25071,6 +25071,7 @@ package android.media { field public static final String KEY_FRAME_RATE = "frame-rate"; field public static final String KEY_GRID_COLUMNS = "grid-cols"; field public static final String KEY_GRID_ROWS = "grid-rows"; + field public static final String KEY_HAPTIC_CHANNEL_COUNT = "haptic-channel-count"; field public static final String KEY_HDR10_PLUS_INFO = "hdr10-plus-info"; field public static final String KEY_HDR_STATIC_INFO = "hdr-static-info"; field public static final String KEY_HEIGHT = "height"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 27499c6160d3..e0193adb0995 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -863,6 +863,12 @@ public final class MediaFormat { */ public static final String KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle"; + /** + * A key describing the number of haptic channels in an audio format. + * The associated value is an integer. + */ + public static final String KEY_HAPTIC_CHANNEL_COUNT = "haptic-channel-count"; + /** @hide */ public static final String KEY_IS_TIMED_TEXT = "is-timed-text"; |