f7dc187c591e4d4fdcfc7a64629f675c9d0f7135 - fp2-dev/platform/frameworks/base

commit	f7dc187c591e4d4fdcfc7a64629f675c9d0f7135	[log] [tgz]
author	Mingming Yin <mingming@codeaurora.org>	Thu Jul 17 18:41:27 2014 -0700
committer	Linux Build Service Account <lnxbuild@localhost>	Tue Nov 04 08:32:19 2014 -0700
tree	3f6d0cc5c97fa3fec36d6e29d2b9b460b873d734
parent	b6b9bf0124366e843aa38913d4784e178d39c2d8 [diff]

audio: audio enhancement for playback and capture.

- Add playback and record support for EVRC, QCELP,
  WMA, AMRWBPLUS, WAV, AC3, and EC3.
- Add support for 5.1 channel recording.
- Add constants for call_state and vsid.
- Add definition for FM and proxy audio devices.

Change-Id: Ib6bba322d4c3bd920be4cb2ef52891de8b1ab568
Conflicts:
media/java/android/media/AudioRecord.java
media/java/android/media/AudioSystem.java
media/java/android/media/MediaRecorder.java
Conflicts:
media/java/android/media/AudioSystem.java

core/jni/android_media_AudioFormat.h[diff]
media/java/android/media/AudioFormat.java[diff]
media/java/android/media/AudioRecord.java[diff]
media/java/android/media/AudioSystem.java[diff]
media/java/android/media/MediaFile.java[diff]
media/java/android/media/MediaRecorder.java[diff]

6 files changed

tree: 3f6d0cc5c97fa3fec36d6e29d2b9b460b873d734