3969 Commits

Author SHA1 Message Date
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
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
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
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
Wei Jia
9e62c75132 MediaSync: rename bufferIndex to bufferId.
Bug: 20887706
Change-Id: I98887832bc2211614a19a3718b46d6da100f6c9b
2015-05-12 10:38:43 -07:00
Jae Seo
8ef4a3c9c0 Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev 2015-05-12 05:21:27 +00:00
Jae Seo
a90338396c TIF: Rename requestUnblockContent to unblockContent
The method TvView.requestUnblockContent doesn't match the name of the
corresponding method in TvInputService, onUnblockContent, hence changed
the name to make it consistent with the current naming scheme.
This change deprecated the requestUnblockContent method as the first
step.

Bug: 19337627
Change-Id: I530209c4dca66305da90ffded7199fa3c1c1780c
2015-05-11 22:14:04 -07:00
Dongwon Kang
b9e26621ba Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev 2015-05-12 04:51:09 +00:00
Jae Seo
606c8a3965 TIF: Unhide the surface layout API
Also fixed some comments to make them more consistent with now public
API.

Bug: 20254168
Change-Id: I62fcdace742603ffd3756c5188c8cf37ccf964ba
2015-05-11 21:25:10 -07:00
Jean-Michel Trivi
46011f8871 AudioRecord.Builder works with no or partial parameters
Complete missing build-time parameters for encoding and channel
  mask, according to documentation.

Bug 20894895

Change-Id: I61f9bfab374effeeded5ae782c4e8513b7310c06
2015-05-11 10:58:16 -07:00
Jean-Michel Trivi
3b12261c50 Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 2015-05-11 17:39:29 +00:00
Paul McLean
1c82b221d4 Merge "Changes as per API council review." into mnc-dev 2015-05-11 15:39:29 +00:00
Dongwon Kang
ba2a1c3b92 TIF: add more documentation on Session.setOverlayViewEnabled().
Bug: 19916441
Change-Id: I56685a7f417541a02078c4b9e9d324e641ec3da5
2015-05-11 19:09:26 +09:00
Jean-Michel Trivi
fd3ac3da17 android.media.AudioRecord.Builder: no "capture preset"
Implement feedback to keep using "audio sources" instead of migrating
  to "capture presets" in AudioRecord.Builder.

Bug 20887665

Change-Id: I4d7773102711c3a4f3f4050b3eb5600bfba889cd
2015-05-09 00:13:07 +00:00
Wei Jia
ea4eb326cf Merge "MediaSync: address API review." into mnc-dev 2015-05-08 23:23:47 +00:00
Paul McLean
e3383cc453 Changes as per API council review.
Bug: 20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
2015-05-08 15:55:18 -07:00
Ronghua Wu
69e927c3cd Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev 2015-05-08 22:53:33 +00:00
Ronghua Wu
c53ad69bcc media: merge CodecException's getErrorCode and getReason.
And unhide getErrorCode.

Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
2015-05-08 15:31:15 -07:00
Wei Jia
2d61e2b97c MediaSync: address API review.
Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();

Bug: 20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
2015-05-08 15:23:28 -07:00
Eric Laurent
e48f44f55b Merge "AudioManager: add previous AudioPort list" into mnc-dev 2015-05-08 21:17:16 +00:00
Eric Laurent
8a1e7a881e AudioManager: add previous AudioPort list
Maintain a cache of previously attached audio ports used
to create lists of added and removed devices following
a port list update callback.

Change-Id: Iad1c95b85c8ae9bdbed79eb0cdc46aeedeafccea
2015-05-08 11:43:05 -07:00
Chong Zhang
1e6be7285d MediaPlayer: pause media time when buffering
bug: 20500732
Change-Id: Ife7f75f5cc587af56451c85ea8adbdc380f38348
2015-05-07 22:43:27 +00:00
Mike Lockwood
fd5637fcce MidiManager: Improve output of "dumpsys midi"
- Include each device's port status from MidiDeviceStatus
- MidiDeviceInfo.toString() now outputs all the names and values in the properties Bundle

Change-Id: Ic9329153e4ae4d5619e274d27a420943473377e5
2015-05-07 13:02:01 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
2015-05-06 16:02:21 -07:00
Eric Laurent
b65cd17b05 Merge "Implement audio routing callbacks" into mnc-dev 2015-05-06 17:51:53 +00:00
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00:00
Eric Laurent
4bcdba8484 Implement audio routing callbacks
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
2015-05-06 17:03:50 +00:00
Jae Seo
936c040ec4 TIF: Make all the parameters for UNRATED null
UNRATED is equivalent to Java null in its meaning and usage, thus it is
not appropriate to use non-trivial strings such as "com.android.tv" and
"UNRATED" to create this constant. Replaced them with the string "null",
which is commonly used in other parts of Android and also modified the
documentation to clarify its usage.

Bug: 19102311
Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13
2015-05-05 15:48:06 -07:00
Jeff Tinker
fc48bf78a2 Clarify wording of MediaCrypto exception "ERROR_NO_KEY"
related-to-bug: 20857014
Change-Id: I13204528ec44cda76a721f4d9f6021c1435921ac
2015-05-05 15:04:01 -07:00
Harish Mahendrakar
34265cd94f media: Added MPEG2 profile/levels and tests
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
2015-05-05 11:05:22 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Robert Shih
5eac1da3bb Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev 2015-05-04 23:50:07 +00:00
Robert Shih
98b6842e30 MediaPlayer: setSubtitleAnchor on a HandlerThread
This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.

Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f
2015-05-04 16:38:30 -07:00
Wei Jia
d80d6f6b05 MediaSync: clean up configureAudioTrack and configureSurface.
Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
2015-05-04 15:59:20 -07:00
Svetoslav
fbf0ecabac Add camera app op - framework
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
2015-05-02 16:23:19 -07:00
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +00:00