Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
310,966 Commits 3 Branches 0 Tags
02ffbf039fb44919ead94de04c991a0957c79431
Commit Graph

5648 Commits

Author SHA1 Message Date
Robert Shih
ac033f033d MediaPlayer: initial timed id3 support 
Change-Id: Ibf2ea8fa1b44f2953bda49cdc6da979c2d3f6be2
 2015-04-17 19:49:13 -07:00
P.Y. Laligand
928bfc4e1c Merge "Consistent null-checking in MediaRouter." 2015-04-18 01:56:43 +00:00
Rachad
cfe964a09c AudioTrack.write() with timestamp support 
Add AudioTrack.write() method that supports timestamps for HW_AV_SYNC tracks

Bug: 19384172
Change-Id: I6a452ae94f1da253c1b1118dece5b3073b941c09
 2015-04-17 18:26:31 -07:00
Andy Hung
4aacc903e3 Add non-blocking writes to AudioTrack 
Change-Id: I4ff47c2851be1b085f4e758f67e391932371027d
 2015-04-17 00:16:17 -07:00
Andy Hung
0e9e2f3724 Add non-blocking reads to AudioRecord 
Change-Id: I63d5345129f197f96f9a13696996071c96551efe
 2015-04-16 23:57:13 -07:00
Eric Laurent
71a9cfc08c Merge "Adding explicit routing API to AudioTrack" 2015-04-17 00:30:03 +00:00
P.Y. Laligand
9d93a378c5 Consistent null-checking in MediaRouter. 
b/19747094

Change-Id: I5f8d086f717a11a9d03874e633471efed787a6c3
 2015-04-16 16:22:35 -07:00
Wei Jia
ba5997e574 MediaSync: get original sample rate from audio track. 
Bug: 19666434
Change-Id: I787b7b06fc5bbff038fb6d06b6f0b869d744ebb3
 2015-04-16 15:30:51 -07:00
Paul McLean
88e1d86a87 Adding explicit routing API to AudioTrack 
Change-Id: Iee7e1ce79e3efd3f8aafd0a5899fe037d314e1be
 2015-04-16 14:02:16 -06:00
Chris Watkins
56d16568c0 Merge "Unhide the android.media.[Media]DataSource interface." 2015-04-16 17:06:46 +00:00
Ronghua Wu
9e9ec943ce media: add reason to CodecException ctor. 
Bug: 19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
 2015-04-15 18:00:52 -07:00
Chris Watkins
4eaa293808 Unhide the android.media.[Media]DataSource interface. 
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.

MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)

Only NuPlayer supports this new data source.

The change introduces:
 * IDataSource:        The binder interface for DataSource.
 * JMediaDataSource:   The native counterpart to the java interface. It
                       implements IDataSource.
 * CallbackDataSource: A stagefright DataSource that wraps an IDataSource.

Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
 2015-04-15 16:33:15 -07:00
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 4c302e8b14.

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