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

893 Commits

Author SHA1 Message Date
Eino-Ville Talvala
ef9db7d81b Add more specific consumer names for common buffer queue endpoints. 
Change-Id: I744bdcba6e60e5efd8865f725b09a9f791d76160
 2015-06-09 14:15:15 -07:00
Jeff Tinker
4575acf1e7 Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev 2015-06-03 20:03:29 +00:00
Robert Shih
eb8a51f359 Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev 2015-06-01 21:56:35 +00:00
Jeff Tinker
025af8b0de Fix bug in MediaCrypto.setMediaDrmSession 
MediaCryptoException was being thrown unexpectedly

bug: 21565802
Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
 2015-06-01 14:17:06 -07:00
Robert Shih
07830aa6ba MediaPlayer: trigger onError instead of exception on stale native notifications 
This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".

Bug: 21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
 2015-06-01 13:50:00 -07:00
Glenn Kasten
626f0dc73b Merge "Deprecations are warnings not errors" into mnc-dev 2015-05-28 22:51:17 +00:00
Glenn Kasten
85d99546a0 Deprecations are warnings not errors 
Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
 2015-05-28 07:59:36 -07:00
Glenn Kasten
16144ac378 Merge "Add comments to indicate code review was done for bugs" into mnc-dev 2015-05-28 14:52:37 +00:00
Robert Shih
410239b6bf MediaPlayer: add mPreparing to weed out unwanted prepared messages 
Bug: 21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
 2015-05-21 16:43:10 -07:00
Glenn Kasten
14d226a2cd Add comments to indicate code review was done for bugs 
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
 2015-05-18 13:54:40 -07:00
Andy Hung
921ded795f Merge "Fix SoundPool.unload() return value" into mnc-dev 2015-05-16 04:11:09 +00:00
Andy Hung
a6238ef389 Fix SoundPool.unload() return value 
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
 2015-05-15 18:43:03 -07:00
Jeff Tinker
7020a1377a Merge "MediaDrm API Updates per api council review" into mnc-dev 2015-05-15 22:13:33 +00:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review 
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
 2015-05-15 01:44:59 +00: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
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
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
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
Wei Jia
ea4eb326cf Merge "MediaSync: address API review." into mnc-dev 2015-05-08 23:23:47 +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
Chih-Hung Hsieh
9eb9dd326a Fix clang warnings on unused variable, mismatched tag, print format. 
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
 2015-05-07 12:30:13 -07:00
Zhijun He
7c3997d96a ImageReader: Image getFormat should return the Image buffer format 
Also return buffer size correctly.

Bug: 19527410
Change-Id: I9a912afc61d577571c1b2a7f6df21da40838e925
 2015-05-06 12:14:36 -07:00
Wei Jia
d80d6f6b05 MediaSync: clean up configureAudioTrack and configureSurface. 
Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
 2015-05-04 15:59:20 -07:00
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +00:00
Chong Zhang
0335916173 MediaRecorder: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
 2015-05-02 02:20:20 +00:00
Chong Zhang
8034d60f6e MediaCodec: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
 2015-05-01 18:30:09 -07:00
Lajos Molnar
5e02ba977e media: hook up MediaCodec.setSurface 
Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
 2015-05-01 17:39:37 -07:00
Lajos Molnar
05ebffe6bf media: Hook up MediaPlayer and MediaSync to new settings 
Bug: 19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
 2015-04-30 16:49:36 -07:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
John Reck
ed207b9274 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

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-30 12:46:57 -07:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00
Andy Hung
f3d3856f3e Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 2015-04-30 00:37:58 +00:00
Andy Hung
26eca01c49 Check for null codec from AMediaCodec_createDecoderByType 
NULL codec can now occur if codec cannot be created.

Bug: 20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
 2015-04-29 14:09:45 -07:00
Svet Ganov
fa5ecdc4ac Respect the record audio app op - framework 
Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
 2015-04-28 16:31:58 -07:00
Ronghua Wu
fb621e8737 media: set codec exception reason. 
Bug: 19620911
Change-Id: I13c007bc82b367680e9a15dc6caed6ef8a81d0a6
 2015-04-28 10:57:57 -07:00
Dan Stoza
3316452ffa ImageWriter: Change detach to sp<GraphicBuffer> 
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.

Bug: 20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
 2015-04-27 11:31:12 -07:00
Zhijun He
18191b4a52 Merge "ImageWriter: fix and cleanup the closed Image Handling" 2015-04-24 21:59:21 +00:00
Zhijun He
a58271419e ImageWriter: fix and cleanup the closed Image Handling 
Attempting to access an Image after it is closed will result in an ISE.

Also fixed some minor doc issues.

Bug: 19872785
Change-Id: I91f037b2b2f243fcbd905d5a646b505bc9c10638
 2015-04-24 13:35:07 -07:00
Wei Jia
25b802d472 MediaSync: fix message delay based on play time for pending audio frames. 
Bug: 19666434
Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
 2015-04-23 15:47:50 -07:00
Lajos Molnar
c98f58efd1 media: add SyncSettings to MediaSync and MediaPlayer 
Bug: 18249558
Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
 2015-04-22 22:45:08 -07:00
Lajos Molnar
b3d5fd2528 media: use PlaybackSettings in MediaSync and MediaPlayer 
Bug: 19666434
Change-Id: Ic5e517534a26f4e3b0294205e0b93f95338bf072
 2015-04-22 21:22:04 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup 
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
 2015-04-22 09:34:34 -07:00
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