diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-25 12:58:14 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2011-07-25 17:06:22 -0700 |
| commit | d9ae1c573e37e245c7f4f0480a8fa925e57bd49d (patch) | |
| tree | 2d61028f503d38aef825ad2029909e3747862012 /media | |
| parent | b243d5bc7db88396f0da304553687e7a0bccfa3d (diff) | |
| download | frameworks_base-d9ae1c573e37e245c7f4f0480a8fa925e57bd49d.zip frameworks_base-d9ae1c573e37e245c7f4f0480a8fa925e57bd49d.tar.gz frameworks_base-d9ae1c573e37e245c7f4f0480a8fa925e57bd49d.tar.bz2 | |
Fix bug 4319552 Java to native channel mask translation
When creating a new AudioTrack instance, translate from a Java
channel mask as defined in android.media.AudioFormat to one
as defined in audio.h which matches industry-standard
channel mask definitions.
Change-Id: I7eeece8ec2a437977c31f6e82590f9591158144b
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 82e8d77..8990fe5 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -54,8 +54,8 @@ public class AudioFormat { /** Default audio channel mask */ public static final int CHANNEL_OUT_DEFAULT = 1; - // Channel mask definitions must be kept in sync with native values - // in /system/core/include/system/audio.h + // Channel mask definitions below are translated to the native values defined in + // in /system/core/include/system/audio.h in the JNI code of AudioTrack public static final int CHANNEL_OUT_FRONT_LEFT = 0x4; public static final int CHANNEL_OUT_FRONT_RIGHT = 0x8; public static final int CHANNEL_OUT_FRONT_CENTER = 0x10; |