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

848 Commits

Author SHA1 Message Date
John Reck
8222a7ec81 Merge "Revert "Change how Java Bitmaps are accessed in a few places"" 2015-04-20 22:07:45 +00:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places" 
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
 2015-04-20 22:06:31 +00:00
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
Chris Watkins
56d16568c0 Merge "Unhide the android.media.[Media]DataSource interface." 2015-04-16 17:06:46 +00:00
Wei Jia
03b3dccffe Merge "MediaSync: pass the error code of setPlaybackRate from native code to JAVA." 2015-04-16 03:05:38 +00:00
Wei Jia
0feab71799 MediaSync: pass the error code of setPlaybackRate from native code to JAVA. 
Bug: 19666434
Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
 2015-04-15 18:06:08 -07: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
John Reck
f7a61483bc Merge "A bunch more cleanups" 2015-04-15 14:48:19 +00:00
Ronghua Wu
4823dee929 Merge "Revert "media: add new MediaCodec Callback onCodecReleased."" 2015-04-15 01:38:23 +00:00
John Reck
c294d128d0 A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-14 15:38:22 -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
Ronghua Wu
69fec1aafc Merge "media: add CodecCapabilities.getMaxSupportedInstances." 2015-04-14 01:10:30 +00:00
John Reck
073f36c6c1 Merge "Change how Java Bitmaps are accessed in a few places" 2015-04-13 19:20:59 +00:00
Ronghua Wu
ee2997577d media: add CodecCapabilities.getMaxSupportedInstances. 
Bug: 19620911
Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
 2015-04-13 11:26:07 -07:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places 
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-13 09:50:42 -07:00
Wei Jia
dfb0e6236b MediaSync: fix a typo. 
Bug: 19666434
Change-Id: I31e959f49d2539e11a9f23f9f9d7eb785ec08512
 2015-04-10 16:48:14 -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
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
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
4c302e8b14 media: add new MediaCodec Callback onCodecReleased. 
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
 2015-04-09 14:47:58 -07: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
Wei Jia
071a8b71d1 MediaSync: add MediaSync JAVA API 
Bug: 19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
 2015-04-03 15:34:34 -07:00
Andy Hung
c09ccc5631 Merge "Fix SoundPool track recycling for fast tracks" 2015-04-01 01:42:00 +00:00
Yin-Chia Yeh
37ec99b19c Merge "Add RAW12 image format" 2015-03-31 18:27:23 +00:00
Andy Hung
32ccb69fde Fix SoundPool track recycling for fast tracks 
Bug: 19970735
Change-Id: I075d04a688383139484f24ba4be2829c5220c57e
 2015-03-30 11:33:33 -07:00
John Spurlock
b4f01b966b Remove the ability to disable audio service. 
Running in a configuration without audio service is not fully tested.
Remove the configuration option for now. Also remove unused delegation
layer in SoundPool.

Bug: 19891112
Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
 2015-03-24 17:22:13 -04:00
Jeff Tinker
4cdc2de0e4 Report key request message type for unprefixed EME 
bug: 19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
 2015-03-23 16:23:12 -07:00
Zhijun He
d1cbc68405 media: fix build break 
clang/llvm complains the timestamp print formating.

Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
 2015-03-23 10:10:04 -07:00
Zhijun He
f6a09e5106 ImageReader/Writer: Add ImageWriter and Opaque ImageReader 
ImageWriter/Reader API change, including below changes
* Interface for Opaque ImageReader
* ImageWriter Interface and implementation
* Image class minor update to support ImageWriter opaque ImageReader

detach/attach interface are defined but yet to be implemented.

Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
 2015-03-20 18:19:58 -07:00
Yin-Chia Yeh
11d444f0b7 Add RAW12 image format 
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
 2015-03-20 17:40:01 -07:00
Andy Hung
2bec0fe3a7 Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack""" 2015-03-17 23:14:24 +00:00
Andy Hung
9bd868fe7a Merge "Revert "Revert "soundpool: reuse channel for same sample if available""" 2015-03-17 23:12:38 +00:00
Andy Hung
bc4537393b Revert "Revert "soundpool: update sample rate when reusing audiotrack"" 
This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1.

Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
 2015-03-17 23:05:12 +00:00
Andy Hung
0c4b81bd3e Revert "Revert "soundpool: reuse channel for same sample if available"" 
This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc.

Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
 2015-03-17 23:02:00 +00:00
Jeff Tinker
5609a32366 am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 
* commit '0d22633e07a6911403383a22bb3164f53b4f4409':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
 2015-03-13 18:43:36 +00:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Ronghua Wu
67cf4a06c7 Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager." 2015-03-12 18:05:47 +00:00
Glenn Kasten
a080050e42 Merge "Revert "soundpool: reuse channel for same sample if available"" 2015-03-10 01:07:32 +00:00
Glenn Kasten
01771a9f7d Merge "Revert "soundpool: update sample rate when reusing audiotrack"" 2015-03-10 01:06:29 +00:00
Andy Hung
0e9a8f6a8e Merge "Fix SoundPool playback of multichannel files." 2015-03-10 00:38:06 +00:00
Eino-Ville Talvala
805f3c9428 Add DEPTH image formats, support in ImageReader 
- Add an explicit mapping between public ImageFormat/
  PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
  formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
 2015-03-09 16:42:25 -07:00
Glenn Kasten
18c225d054 Revert "soundpool: reuse channel for same sample if available" 
This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5.

Bug: 19635137
Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
 2015-03-09 08:40:12 -07:00
Glenn Kasten
b801f73343 Revert "soundpool: update sample rate when reusing audiotrack" 
This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9.

Bug: 19635137
Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
 2015-03-09 08:39:46 -07:00
Andy Hung
a1c3516a24 Fix SoundPool playback of multichannel files. 
Bug: 17188507
Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
 2015-03-06 15:00:42 -08:00
Lajos Molnar
a92d6e28ad Merge "media: update AMessage to use handler instead of handler-id" 2015-03-06 03:09:19 +00:00
John Reck
f4faeac352 Cleanup Bitmap JNI attempt #2 
Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
 2015-03-05 13:56:16 -08:00
Chad Jones
b9a468eb19 Merge "Revert "Cleanup Bitmap JNI"" 2015-03-05 19:35:15 +00:00
Chad Jones
c02977e3bb Revert "Cleanup Bitmap JNI" 
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
 2015-03-05 19:34:26 +00:00