9741 Commits

Author SHA1 Message Date
Jae Seo
194118f913 Merge "Make PlaybackParams parcelable" into mnc-dev 2015-05-18 18:05:34 +00:00
Jae Seo
76c4fc2977 Make PlaybackParams parcelable
Bug: 21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
2015-05-18 17:54:47 +00:00
Lajos Molnar
c8304e86c8 Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev 2015-05-18 17:32:17 +00:00
Robert Shih
40bdcb7c52 Merge "MediaPlayer: persistent track indices" into mnc-dev 2015-05-18 15:56:31 +00:00
Jae Seo
4b34cc7763 TIF: Pass the playback params as a whole
Bug: 21172914
Change-Id: I2d89f267d8d83b14b5d436304aa0ff82490211d8
2015-05-16 15:01:53 -07:00
Andy Hung
921ded795f Merge "Fix SoundPool.unload() return value" into mnc-dev 2015-05-16 04:11:09 +00:00
Glenn Kasten
6e745aecf9 Merge "Rename mChannels to mChannelMask" into mnc-dev 2015-05-16 02:11:56 +00:00
Andy Hung
a6238ef389 Fix SoundPool.unload() return value
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
2015-05-15 18:43:03 -07:00
Lajos Molnar
c9020aff3a media: clarify valid values in PlaybackParams and SyncParams
Bug: 21134712
Change-Id: I42182733013d70e11d8c59bf4f5daa7eeb374597
2015-05-15 18:33:28 -07:00
Robert Shih
a460ea1a2c MediaPlayer: persistent track indices
Maintain inband (from native extractor) and out-of-band tracks (added by
client) in a single append only vector. This ensures that the same track
corresponds to the same index through out playback.

Bug: 10373268
Change-Id: I87b3ca2d2c710ee9087f7686f82ab0e018f55fd0
2015-05-15 17:04:32 -07:00
Robert Shih
1973189fe0 MediaPlayer: clean up subtitle controller log spam
- create a default SubtitleController if not set explicitly
- log warning instead of error

Bug: 17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a
2015-05-15 17:03:46 -07:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Paul McLean
0c72f4f9d0 Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev 2015-05-15 14:35:50 +00:00
Jae Seo
ed6586a569 TIF: Remove incorrect audio mode check
Bug: 21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60
2015-05-14 19:16:30 -07:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
2015-05-15 01:44:59 +00:00
Paul McLean
f62c7428e7 Change AudioDevicesInfo.getFormats() to getEncodings().
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
2015-05-14 14:57:08 -07:00
Zhijun He
758e6a8f70 Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev 2015-05-14 21:46:38 +00:00
Zhijun He
492afe9014 Merge "Image/Reader/Writer: address API review comments" into mnc-dev 2015-05-14 21:44:01 +00:00
Zhijun He
d99dc329b9 Image/Reader/Writer: address API review comments
* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils

Bug: 21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c
2015-05-14 14:35:57 -07:00
Chong Zhang
7fc802bbf7 Merge "MediaDataSource: address API council comments" into mnc-dev 2015-05-14 21:29:52 +00:00
Chong Zhang
bc10185fa1 MediaDataSource: address API council comments
- throw IOExecption on fatal errors

- add offset argument to readAt

- and fix a crash in MediaExtractor

bug: 21045118
bug: 21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
2015-05-14 14:19:01 -07:00
Lajos Molnar
51bf5d9c07 Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev 2015-05-14 21:17:31 +00:00
Lajos Molnar
05a822161f media: change final fields to accessors in MediaTimestamp
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8 media: remove setPlaybackRate from MediaPlayer and MediSync
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.

Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
2015-05-14 12:16:44 -07:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Jean-Michel Trivi
f578953ead Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev 2015-05-14 03:21:55 +00:00
Jean-Michel Trivi
6c307879b7 AudioTrack in SoundPool uses audio_attributes_t parameter
Bug 20731155

Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
2015-05-13 19:26:12 -07:00
Andy Hung
2bdd69c4a2 Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev 2015-05-14 02:18:02 +00:00
Jaesung Chung
58739e7584 TIF: Add DVB device handling to TvInputManagerService
Added an API to pass an open file descriptor of DVB devices and
addressed the security issue of setting the permissions on DVB devices
to 0666.

Bug: 20436120
Change-Id: I4649e76084f3356ec22b7e776fb87c6a8fdc00d6
2015-05-14 02:00:06 +00:00
Andy Hung
bece0c7a1d Add getChannelIndexMasks API to AudioDeviceInfo
Fix some javadoc as well.

Bug: 21129531
Change-Id: I82e5b66f254f6acdcd93638eeed878b4c5b5be34
2015-05-13 18:33:28 -07:00
Robert Shih
55e6ad78a0 Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev 2015-05-13 23:36:51 +00:00
Robert Shih
b7514effd1 MediaPlayer/TimedMetaData: API updates related to timed metadata
- renamed MediaPlayer.*OnTimedMetaData* to *OnTimedMetaDataAvailable*
- added `final` modifier to TimedMetaData class
- added javadocs for TimedMetaData public methods
- renamed private members and cooresponding accessors for TimedMetaData
- reworded existing TimedMetaData javadoc

Bug: 21045118
Change-Id: If0113307fce08083226fc7f64c4fe6f93553d899
2015-05-13 16:19:51 -07:00
Lajos Molnar
907d8afd6b Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev 2015-05-13 23:01:28 +00:00
Paul McLean
338f27ab28 New policy for internal and wired device names.
For internal and unknowable wired devices, return the product name (i.e. "Nexus 7").
For connected devices with manufacturer-supplied product names, return those.
Change getName() to getProductName().

Bug: 20880296
Change-Id: I67ef3d4c73b3acab368b0879faa26fa9127c21bb
2015-05-13 15:41:00 -07:00
Jae Seo
ae649b1af8 Merge "TIF: API Review: android.media.tv" into mnc-dev 2015-05-13 21:44:01 +00:00
Lajos Molnar
6b7ef3725e media: rename MediaCodec.setSurface to setOutputSurface
Bug: 21045402
Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
2015-05-13 14:43:33 -07:00
Chong Zhang
80283cd747 Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev 2015-05-13 19:57:12 +00:00
Chong Zhang
9560ddb48a MediaCodec: rename usePersistentInputSurface to setInputSurface
bug: 21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
2015-05-13 10:53:47 -07:00
Paul McLean
7b0e380bf0 Merge "API Council Change Phase 2 - add/remove callback" into mnc-dev 2015-05-13 16:19:00 +00:00
Paul McLean
033468868d API Council Change Phase 2 - add/remove callback
Change-Id: Ic7d374c67ef46a2bc8427fa3555e3ad1a4b0723e
2015-05-13 08:01:19 -07:00
Jae Seo
3d04b76934 TIF: API Review: android.media.tv
Addressed the feedback from the API Review:

android.media.tv.TvView.TimeShiftPositionCallback
Please add more documentation to explain why we are using the wall-clock
time here.

android.media.tv.TvInputService
onTimeShiftSetPlaybackRate should be renamed to
onTimeShiftSetPlaybackParams and pass in the PlaybackParams object
(formerly known as PlaybackSettings) instead of the rate and mode
separately.

android.media.tv.TvTrackInfo
getDescription() should return a CharSequence not a String.

android.media.tv.TvTrackInfo.Builder
setDescription() should take a CharSequence as input.

android.media.tv.TvView
Change timeShiftSetPlaybackRate() to setTimeShiftPlaybackParams() and
use the PlaybackParams object (formerly known as PlaybackSettings)
instead of the rate and mode separately.

Bug: 21045120
Change-Id: I768665ae9c385fcb034bfb346c21b4c9f0891172
2015-05-12 20:14:37 -07:00
Glenn Kasten
ada99cd762 Merge "Spell out parameters" into mnc-dev 2015-05-12 23:39:13 +00:00
Mike Lockwood
62975ae43d Merge "MidiManager: Address API Council feedback:" into mnc-dev 2015-05-12 22:02:45 +00:00
Glenn Kasten
9ea5e55648 Rename mChannels to mChannelMask
Change-Id: I9a6ee1d8223626cc9ecd3bf032c9e9f818258b0f
2015-05-12 14:37:07 -07:00
Glenn Kasten
340a6d09bd Minor cleanup of comments and code
Change-Id: I393c9a882714f1682fa7a360e2cdd5e66a5d4e39
2015-05-12 14:36:12 -07:00
Glenn Kasten
5f68c7a3f8 Spell out parameters
Change-Id: I7937e5f84fabee64cc1ebd5b8c1b45a1ff759ffe
2015-05-12 14:35:23 -07:00
Mike Lockwood
7eb441cb4a MidiManager: Address API Council feedback:
Rename MidiDeviceInfo.getPortList() to getPorts()

Rename MidiManager.getDeviceList() to getDevices()

Rename MidiReceiver.onReceive() to onSend()

Replace MidiManager.DeviceOpenCallback and BluetoothOpenCallback
with new interface MidiManager.OnDeviceOpenedListener

Add MidiSender.onConnect() and onDisconnect()

Add MidiReceiver.onFlush()

Ensure that MidiReceiver max message size is immutable

Bug: 21044677
Change-Id: I7711734a45e831e9744849a6f569e906feff9f80
2015-05-12 13:39:56 -07:00
John Spurlock
e66ba47366 Merge "Zen: Ringer mode integration fixes." into mnc-dev 2015-05-12 19:54:48 +00:00
John Spurlock
50ced3f323 Zen: Ringer mode integration fixes.
- Properly mute media + alarm streams in total silence.
 - Allow system components to update the "ringer mode affected"
   streams dynamically.
 - Improve dumpsys output for ringer mode streams (include names).
 - Remember last ringer mode properly when entering dnd via a
   volume down (so we can restore it properly when exiting).

Bug: 20854925
Bug: 20950463
Bug: 20756527
Change-Id: I80afc1f639ff802c541020e25ade1b23e9997ef9
2015-05-12 14:42:48 -04:00
Wei Jia
0cd3881aaf Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev 2015-05-12 17:43:47 +00:00