From f8d5e7af7457ee0d935be63cb7e1479f147f7451 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Tue, 15 Apr 2014 09:24:16 -0700 Subject: Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE Change-Id: I6d5ff001ee55399a67380a4f63b037f367b93b1f --- media/java/android/media/AudioFormat.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 04c6e9735cd1..ad0d45951be7 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -88,12 +88,22 @@ public class AudioFormat { public static final int CHANNEL_OUT_MONO = CHANNEL_OUT_FRONT_LEFT; public static final int CHANNEL_OUT_STEREO = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT); + // aka QUAD_BACK public static final int CHANNEL_OUT_QUAD = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT); + /** @hide */ + public static final int CHANNEL_OUT_QUAD_SIDE = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_SIDE_LEFT | CHANNEL_OUT_SIDE_RIGHT); public static final int CHANNEL_OUT_SURROUND = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_BACK_CENTER); + // aka 5POINT1_BACK public static final int CHANNEL_OUT_5POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT); + /** @hide */ + public static final int CHANNEL_OUT_5POINT1_SIDE = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | + CHANNEL_OUT_SIDE_LEFT | CHANNEL_OUT_SIDE_RIGHT); + // TODO does this need an @deprecated ? // different from AUDIO_CHANNEL_OUT_7POINT1 public static final int CHANNEL_OUT_7POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT | -- cgit v1.2.3-59-g8ed1b