drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
192,270 Commits 1 Branch 0 Tags
Commit Graph

3985 Commits

Author SHA1 Message Date
Paul McLean
55787399c9 Merge "Audio Devices Enumeration/Notification API" 2015-04-15 21:08:27 +00:00
Paul McLean
a33be211e7 Audio Devices Enumeration/Notification API 
Change-Id: I4eecfa43e4fecfe309ddd805ed193d078b10d5e6
 2015-04-15 10:56:49 -06:00
Jae Seo
b744e47959 Merge "TIF: Add pixel aspect ratio to TvTrackInfo" 2015-04-15 05:51:18 +00:00
Jean-Michel Trivi
f14c535041 Merge "Define AudioMix state constants" 2015-04-15 02:05:44 +00:00
Andy Hung
8f08d04b4e Merge "Default to minimum buffer size for AudioRecord.Builder" 2015-04-15 01:54:20 +00:00
Ronghua Wu
0e08a225da Merge "media: Add reason to CodecException." 2015-04-15 01:40:52 +00:00
Andy Hung
864ae67852 Default to minimum buffer size for AudioRecord.Builder 
Add AudioRecord.getNativeFrameCount to allow apps to
retrieve the size of the buffer created.

Change-Id: I4c539677726f89afd36fe7b1d24c8b29ada91402
 2015-04-14 18:40:02 -07:00
Ronghua Wu
4823dee929 Merge "Revert "media: add new MediaCodec Callback onCodecReleased."" 2015-04-15 01:38:23 +00:00
Jae Seo
24ed8072f5 TIF: Add pixel aspect ratio to TvTrackInfo 
Needed to handle scaling properly for some video formats such as 720x576
4:3 and 720x576 16:9 (the most common European SD formats) where pixels
are not square.

Bug: 19500694
Change-Id: I4d245ed40e8b80f7efd6acdb059d20b63b4ef9de
 2015-04-14 18:29:51 -07:00
Jean-Michel Trivi
cc98c67ef7 Define AudioMix state constants 
Bug 20226914

Change-Id: Ie513fcdaaffd4ae3ed7fbd8d24fe8683959739e3
 2015-04-14 15:10:30 -07:00
Ronghua Wu
4fd31a2a71 media: Add reason to CodecException. 
Bug: 19620911
Change-Id: Ic7244a2369a04bfd69e703415a8c9aacdcbf3c57
 2015-04-14 15:00:32 -07:00
Ronghua Wu
41eedcf311 Revert "media: add new MediaCodec Callback onCodecReleased." 
This reverts commit 4c302e8b141cd490733130e86e44fa4f216de457.

Change-Id: I563ba6419cf61968bf356c5b096445dde55abac2
 2015-04-14 21:12:07 +00:00
John Spurlock
1740c625c6 Merge "Zen: Enter alarms only on volume down from vibrate." 2015-04-14 20:00:42 +00:00
John Spurlock
b02c744f05 Zen: Enter alarms only on volume down from vibrate. 
And vice versa (when dialog is showing).

Also make alarms only the default mode when DND is switched on
via the switch.

Bug: 19260237
Change-Id: I16e4a27944bc8245bb2beed84c0421d493b0b876
 2015-04-14 09:36:28 -04:00
Ronghua Wu
69fec1aafc Merge "media: add CodecCapabilities.getMaxSupportedInstances." 2015-04-14 01:10:30 +00:00
Andy Hung
4bd513e6ed Default to minimum buffer size for AudioTrack.Builder 
Expose AudioTrack.getNativeFrameCount as public to allow apps to
retrive the size of the buffer created.

Change-Id: Ifc07196d65d6a68657fd879bcc1819c2077de202
 2015-04-13 16:25:51 -07:00
Andy Hung
ec9f15a9e4 Merge "Increase AudioRecord sample rate limit to 96kHz" 2015-04-13 21:18:07 +00:00
Andy Hung
5076ea90af Increase AudioRecord sample rate limit to 96kHz 
Change-Id: I3e296a30b828cbea9fd2eab2b8db81833c20d7cf
 2015-04-13 14:14:11 -07:00
Glenn Kasten
bed238fcea Merge "Android MIDI User Guide draft of 4/10/2015" 2015-04-13 18:59:15 +00:00
Phil Burk
1b83e3f75e Android MIDI User Guide draft of 4/10/2015 
Change-Id: I80db2c29af581ff3d9d6bd87f5f79c1fde5c3055
Signed-off-by: Glenn Kasten <gkasten@google.com>
 2015-04-13 11:54:57 -07:00
Ronghua Wu
ee2997577d media: add CodecCapabilities.getMaxSupportedInstances. 
Bug: 19620911
Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
 2015-04-13 11:26:07 -07:00
Andy Hung
00b9bcda8a Merge "Add channel index mask to AudioTrack and AudioFormat" 2015-04-11 06:13:14 +00:00
Andy Hung
4ef1305aa8 Merge "Add floating point AudioRecord read" 2015-04-11 05:44:23 +00:00
Andy Hung
a9470c19a9 Add channel index mask to AudioTrack and AudioFormat 
Change-Id: Ia5faa56360edcbbdeae8838ec0f82386f4e5e640
 2015-04-10 17:41:00 -07:00
Wei Jia
e833b534c9 Merge "MediaSync: add getTimestamp in MediaSync." 2015-04-10 22:44:09 +00:00
Wei Jia
217ec0adfc MediaSync: add getTimestamp in MediaSync. 
Bug: 19666434
Change-Id: Ieae70b13864e3eb5abae3577f209f4b926418731
 2015-04-10 14:44:06 -07:00
Jeff Tinker
2c611f146f Merge "Add a method to associate MediaDrm session with MediaCrypto" 2015-04-10 21:03:19 +00:00
Ronghua Wu
76ef9b07f7 Merge "media: add MediaFormat.KEY_OPERATING_RATE." 2015-04-10 20:10:04 +00:00
Mike Lockwood
d4ca39e75c Merge changes I075a54dc,I0a9bc7c3 
* changes:
  Add user visible name for USB peripheral MIDI device
  Add MidiDeviceInfo.getPortList()
 2015-04-10 16:54:02 +00:00
Mike Lockwood
9189f5f025 Add MidiDeviceInfo.getPortList() 
This replaces MidiDeviceInfo.getInputPortInfo() and getOutputPortInfo()

Change-Id: I0a9bc7c34a172a072e86718d465967c6c618fb3b
 2015-04-10 08:49:47 -07:00
Jeff Tinker
6f6ef118a7 Add a method to associate MediaDrm session with MediaCrypto 
Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor.  This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over.  Use
cases like key rotation require being able to update the
MediaDrm session post-construction.  This CL addresses both of
these issues.

bug: 19570317
Change-Id: Ie3d3eda16651b598cdd41f2180074a43cb6c0884
 2015-04-10 04:15:15 -07:00
Chong Zhang
0bb34ca325 Merge "MediaMetadataRetriever: add key for capture fps" 2015-04-10 02:29:38 +00:00
Jeff Tinker
74797f843c Add expiration update and keys change events 
In support of unprefixed EME

bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
 2015-04-09 22:44:36 +00:00
Ronghua Wu
564eb45b00 Merge "media: add new MediaCodec Callback onCodecReleased." 2015-04-09 22:29:14 +00:00
Ronghua Wu
4c302e8b14 media: add new MediaCodec Callback onCodecReleased. 
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
 2015-04-09 14:47:58 -07:00
Mike Lockwood
f0a41d1c59 Add support for Bluetooth MIDI devices 
The Bluetooth MIDI devices are handled in the BluetoothMidiService APK.
Apps wishing to connect to Bluetooth MIDI devices call MidiManager.openBluetoothDevice()
which binds to BluetoothMidiService in a similar way as virtual devices are implemented.

Change-Id: Ie3fbca757928fd7873a009f9bf9e0ce0be487da6
 2015-04-09 11:49:51 -07:00
Mike Lockwood
b6f50d357b Add support for flushing MIDI all scheduled MIDI events on a port 
Change-Id: I39d7862540d4d4b9e2df1265f9dd253541adb4c2
 2015-04-09 11:49:45 -07:00
Dongwon Kang
ff1f29e1b1 TIF: add a video unavailable constant for audio program case. 
Bug: 20019339
Change-Id: Ife3452486c065e6c5809f0cd2bb87794c4279312
 2015-04-08 15:21:06 -07:00
Zhijun He
b0c98dac3d Merge "ImageReader/Writer: implement opaque format operations" 2015-04-08 18:57:59 +00:00
Zhijun He
ce9d6f9c75 ImageReader/Writer: implement opaque format operations 
Implement attach/detach for image reader and writer.

Bug: 19872821
Change-Id: Ib45a054c6be0b56b370fa8d709b47b0298ba5ea7
 2015-04-08 10:39:29 -07:00
Jae Seo
465f0d6aa3 TIF: Redefine time shift status and change callback and position APIs 
Also added/modified the documentation and addressed feedback from the
previous CL.

Change-Id: I046970cd0d2688886039d37a332bbe11bc5a4b0f
 2015-04-07 17:34:39 -07:00
Chong Zhang
8f73a1be7c MediaMetadataRetriever: add key for capture fps 
bug: 19460202
Change-Id: I3b7ebe298d78bbd292cf6202c43da674e43db854
 2015-04-07 17:32:16 -07:00
Jean-Michel Trivi
9e62d31fd1 Merge "AudioTrack: update javadoc for missing DEAD_OBJECT return code" 2015-04-07 21:42:15 +00:00
Ronghua Wu
3392ce4a04 media: add MediaFormat.KEY_OPERATING_RATE. 
Bug: 19620911
Change-Id: I5c742adaac2175fbbc06821ba0a516c72cc4f3f7
 2015-04-07 13:38:31 -07:00
Andy Hung
58b0f3f332 Add floating point AudioRecord read 
Change-Id: Ibbdbfdefb84b515c231723fb621662bc4920ff86
 2015-04-07 12:29:27 -07:00
Ronghua Wu
76477a25fa Merge "media: add undocumented exceptions to MediaCodec api." 2015-04-07 19:15:19 +00:00
Jean-Michel Trivi
136e006248 AudioTrack: update javadoc for missing DEAD_OBJECT return code 
Update the javadoc of the write() methods to indicate they can
  return AudioManager.DEAD_OBJECT.

Bug 19169728

Change-Id: I560c5efba37c2cc8b870573558e0cab634cb3f5d
 2015-04-07 09:58:41 -07:00
Mike Lockwood
8bf7eecb9f Merge "Add MidiManager and MidiDevice classes to public API." 2015-04-06 15:53:36 +00:00
Jeff Sharkey
1b8ef7e316 Parcelable objects for Disk/Volume. 
Will eventually be used by SystemUI and/or Settings.

Also fix SettingsProvider NPE.

Bug: 19993667, 19909433
Change-Id: Ie326849ac5f43ee35f728d9cc0e332b72292db70
 2015-04-04 14:40:46 -07:00
Rom Lemarchand
5cd2e66925 Merge "Change audio include path from system/core to system/media/audio" 2015-04-04 01:13:49 +00:00