Commit Graph

51 Commits

Author SHA1 Message Date
Eric Laurent
abda9c33e5 Make Dolby TrueHD audio format public
Bug: 30024357
Change-Id: I4e8e8cde6e6c87c96e07e1828da0fad96c0f9e76
2016-07-11 17:08:14 -07:00
Eric Laurent
b4fae5ba39 Add Dolby TrueHD audio format
Format is not public for now.
Unhide at next API bump.

Bug: 30024357
Change-Id: Ic307214d8ac8b7bb57609bf609366968efafd7cc
2016-07-07 18:58:11 -07:00
Phil Burk
621dbc8740 Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
2016-03-21 11:15:02 -07:00
Jeff Sharkey
50d1c044b5 Parcelable classes should always be final.
Also hide ConnectivityMetricsEvent which isn't being used yet.

Bug: 27415331
Change-Id: Iacdccddda504f3f669185f807b4f35b8dc2b0212
2016-02-29 16:46:09 -07:00
Jean-Michel Trivi
768d81374b Merge "Audio record notification: report audio device information" into nyc-dev 2016-02-26 22:37:34 +00:00
Jean-Michel Trivi
8ab728093e Audio record notification: report audio device information
Support querying the AudioDeviceInfo in AudioRecordConfiguration.
When AudioService (through RecordingActivityMonitor) receives
  a recording event on an existing session, report it as an
  update if the recording configuration has changed.

Bug 22876530

Change-Id: I1b72c08aa0589077fe8ad254087965e6384ce50a
2016-02-26 11:11:30 -08:00
Glenn Kasten
1cbf9b3741 Allow sample rate UNSPECIFIED to mean a route-dependent value
Bug: 25641253
Bug: 21019153
Change-Id: I3b8e01b6ea09f42c813ab1a0f3f625dc3803cc0b
2016-02-25 11:39:37 -08:00
Jean-Michel Trivi
5affc2b587 Make android.media.AudioFormat parcelable
Bug 22876530

Change-Id: If027715aad32ce8796a7e223ba51c301a3dd1192
2016-02-22 17:29:32 -08:00
Phil Burk
4ddbc0e377 AudioFormat: add ENCODING_IEC61937
Allows applications to wrap compressed audio in a PCM
stream and pass through directly to HDMI output.

Bug: 24541671
Bug: 20891646
Bug: 26373761
Change-Id: I67a25672a3b5066b5747380d013c26e60c14c272
Signed-off-by: Phil Burk <philburk@google.com>
2016-01-27 22:08:42 +00:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
Andy Hung
04065187d9 Clarify AudioFormat sample rate and encoding documentation
Bug: 21476142
Change-Id: I74fa3fcced5cc197a4cee6a7c10f3ed4690b0af1
2015-05-29 10:17:40 -07:00
Jean-Michel Trivi
48d88128bd Remove temporary javadoc for android.media.AudioFormat
Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
2015-05-26 11:50:11 -07:00
Jean-Michel Trivi
4ed06d2e30 More android.media.AudioFormat javadoc
More doc about AudioFormat constants, use of the builder,
 sample rate, channel masks (position vs index, examples)

Bug 20921159

Change-Id: Ie60c2f3558b8b6008c6d9fb646ad9f6de396859d
2015-05-22 18:10:06 -07:00
Andy Hung
b14b7e188f Merge "Fix AudioTrack, AudioRecord, AudioFormat API" into mnc-dev 2015-05-20 23:01:39 +00:00
Andy Hung
e90a0a88f4 Fix AudioTrack, AudioRecord, AudioFormat API
Rename getNativeFrameCount to getBufferSizeInFrames
Remove throw declaration on IllegalArgumentException and
IllegalStateException

Bug: 20887665
Bug: 21304902
Change-Id: Ia85d8010be46524b9a8b93105b16b7b9480f6bd9
2015-05-20 22:58:31 +00:00
Eric Laurent
cae3466333 AudioFormat: more compressed formats
Add MP3 and AAC as valid AudioFormat encodings.
Only @hide for now to allow system components to manage
audio patches with those formats.

Bug: 18649264.
Change-Id: I5ef5f151783308e31d8ac5b29454589077ef62ea
2015-05-19 16:46:52 -07:00
Andy Hung
7fdf51b18a Unhide new channel masks and deprecate old channel masks
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
2015-04-24 14:27:21 -07:00
Andy Hung
a9470c19a9 Add channel index mask to AudioTrack and AudioFormat
Change-Id: Ia5faa56360edcbbdeae8838ec0f82386f4e5e640
2015-04-10 17:41:00 -07:00
Rom Lemarchand
b2b2923174 Change audio include path from system/core to system/media/audio
Change-Id: Iefd5933e7ba10fa2a8ca3489bcbee3bc8f1396ad
2015-04-03 15:11:28 -07:00
Phil Burk
e12189dee6 audio: add AudioFormat.ENCODING_DTS
Bug: 18292317
Change-Id: I457a6996947d6d24ef7f8f152ee586029036acf5
Signed-off-by: Phil Burk <philburk@google.com>
2015-03-31 14:38:30 -07:00
Jean-Michel Trivi
8dc1031453 Convert record channel mask for dynamic mix
When creating the AudioRecord instance for a dynamic mix, convert
  the output channel mask of the mix to an input channel mask
  to be used by the AudioRecord instance through which the
  mixed audio is rerouted.

Bug 16009464

Change-Id: I3addbe85339f6f06b69acc3f9b8e2a765e5d7305
2014-11-20 12:53:23 -08:00
Jean-Michel Trivi
aea175e499 More android.media.AudioFormat.Builder javadoc
Bug 17059703

Change-Id: I1cca2effecbf1998dfa48774d87d94c00285c16c
2014-09-09 17:52:22 -07:00
Eric Laurent
d3b8223377 SoundTrigger API update.
Add sound model update callback.
Add native service state change callback.
Add vendor UUID in sound model description.
Add coarse confidence level in recognition event.
Add capture format in recognition event.

Bug: 12378680.

Change-Id: Id63437819ec7b9a4a69e1ff6185b747e20cad95e
2014-08-04 16:35:27 -07:00
Eric Laurent
0498269c00 unhide AudioFormat getters
Bug: 12378680.
Change-Id: Ibe49c6386b12159e705f49f323cae27b6e2d749a
2014-07-31 17:12:53 -07:00
Jean-Michel Trivi
701d6ff12f AudioAttributes and AudioRecord.
Add audio recording source in AudioAttributes.
New AudioRecord constructor with AudioAttributes and
  AudioFormat.
Legacy AudioRecord constructor is calling into the new
  constructor.

Bug 16009464

Change-Id: I69d81f9e71bdf946c4cfbda6d3d8552ffac6b5c2
2014-07-28 21:30:13 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
2014-07-18 17:07:04 -07:00
Jean-Michel Trivi
d2bebb3ab8 DO NOT MERGE Audio virtualizer effect: add support for querying capabilities
Change-Id: Ib62bab6655996575d7703be0bcb55fa8559a68a2
(cherry picked from commit 57fa19dec7150678020e7f1fe6e6879fd9d873f5)
2014-07-15 15:45:16 +00:00
Jean-Michel Trivi
a8b6bd88cf Define audio policy, mixes, and mixing rules
An AudioMixingRule is a collection of AudioAttributes and match/exclude
   rules.
An AudioMix is defined by its AudioMixingRule, AudioFormat and
   routing flag.
An AudioPolicyConfig is a collection of AudioMix and is
   parcellable.
An AudioPolicy has an AudioPolicyConfig, and
   can be registered/unregistered through AudioManager.

bug 16009464

Change-Id: I01bf95d014967f48ba823648ea897779da099e5d
2014-07-11 09:10:46 -07:00
Jean-Michel Trivi
a1d80e3b1d AudioTrack Java constructor with AudioAttributes and AudioFormat
Change-Id: I82758a4231b8dc0b8d8e72acf3c896a289c28f60
2014-06-24 17:02:06 -07:00
Eric Laurent
ff0d9f098e AudioTrack: Add support for compressed audio
Add AudioFormat encoding definitions for compressed audio
and modify AudioTrack to accept compressed audio data.

Bug: 9428304.

Change-Id: Ib85a4d0d78af45924328f4d2d2ffebe83f4a00c5
2014-06-19 10:13:33 -07:00
Andy Hung
2854ed5025 Fix AudioFormat getBytesPerSample to recognize float
Bug: 15719638
Change-Id: Id53a07ef24e4403f3bad7a13c4dd801e556769eb
2014-06-18 10:51:15 -07:00
Jean-Michel Trivi
f723f8e9cf AudioFormat class
Change-Id: I425c80c6caed98f6fa31e8cad8f15435c99ebc20
2014-06-02 19:31:05 -07:00
Glenn Kasten
1aa74e4bc2 Remove android.media.AudioFormat default constructor
Change-Id: I2fe65ee7a8087151b44da3b84af357ea8bee80c4
2014-05-22 17:13:06 -07:00
Glenn Kasten
7d60bcd2d9 Unhide AudioTrack support for ENCODING_PCM_FLOAT
Change-Id: I77423ff1845d0e05c117ab2a0b31699b32b871be
2014-05-08 16:39:19 -07:00
Glenn Kasten
313f59887b Add AudioFormat.ENCODING_PCM_FLOAT
Change-Id: I030d2c74224ac8573a4d30d980ae94fa4e280aeb
2014-05-06 17:24:26 -07:00
Glenn Kasten
34a37bdebb Add AudioFormat.getBytesPerSample and use it
Change-Id: I90a40987ea99006af4a6e31136078c04976eb54d
2014-05-06 09:11:52 -07:00
Glenn Kasten
f8d5e7af74 Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE
Change-Id: I6d5ff001ee55399a67380a4f63b037f367b93b1f
2014-04-15 10:48:23 -07:00
Glenn Kasten
c806050a07 Synchronize channel masks in AudioFormat with system/audio.h
AudioFormat channel mask comments

Change-Id: I8b43cb58cd9d3a33bf02aa0455bbfc16ed29f9ae
2014-03-28 15:16:50 -07:00
Glenn Kasten
fe834d30f4 Prepare for additional formats beyond 8-bit and 16-bit PCM
This CL does the same thing for AudioTrack,
that an earlier CL did for AudioRecord:
  > Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f

Pull out the common parts of that earlier CL and move them to new header
file android_media_AudioFormat.h.

Use the new function audioFormatToNative() to convert from Java
ENCODING_PCM_* to native AUDIO_FORMAT_*.

Use audio_bytes_per_sample() instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: I7992dd6a2c9500126a6d7ae5fc1ed9f3312962d6
2014-01-10 10:50:22 -08:00
Glenn Kasten
5c17a820f9 Audio Java doc comment typos and minor changes
Change-Id: Id6ea6dccb8054c9f05db9a9c045387ce813659e6
2012-01-09 12:15:18 -08:00
Jean-Michel Trivi
d9ae1c573e 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
2011-07-25 17:06:22 -07:00
Jean-Michel Trivi
ff7656c9de Fix bug 4211099 channel constants and 7.1 mask
Add definitions for the side and elevated channels.

Add new (correct) definition for 7.1 mask which uses
 the side channels rather than the front half-pan channels.

Change-Id: I13d93f99f3b453ce2ab5fdc2da66629ed7f337ef
2011-07-24 16:25:38 -07:00
Scott Main
613d363c96 am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs
Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'

* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
  fix doc bugs
2010-08-05 12:07:55 -07:00
Scott Main
5b86de94a1 fix doc bugs
Change-Id: Ic0cec3818fdc7692ea7aa3152ecb444203097157
2010-08-04 17:07:36 -07:00
Dan Tasse
635fefec06 Add some javadoc to AudioRecord, plus updates based on code review comments.
Change-Id: I0087e7df7541b336f87c7af512c3e8f3897be72c
2010-07-14 15:30:55 -07:00
Eric Laurent
3026a023b8 Fix issue 2001517: AudioTrack compatibility issue.
Modified enum values in AudioFormat.java and AudioSystem.h.
Added code for backward compatibility in AudioTrack.java and AudioRecord.java.
2009-07-27 12:21:29 -07:00
Eric Laurent
a553c25b33 Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
2009-07-23 06:03:39 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00