Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,862 Commits 3 Branches 0 Tags
d58e6cf14b671ce84dc350fdd60da8ce5070cdbd
Commit Graph

103 Commits

Author SHA1 Message Date
Jeff Tinker
d393216f8a Add error code to MediaCodec.CryptoException 
Added a code to represent unsupported operations

bug: 25929554
Change-Id: Id8bfa092f29de073db19c4d7444f89249ea2cdd5
 2016-03-05 11:53:23 -08:00
Jeff Tinker
6430b15495 Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-dev 2016-03-01 02:26:30 +00:00
Jeff Tinker
8ad2965d00 Add javadocs to MediaCodec.CryptoInfo methods 
bug:27383993

Change-Id: I11bba4a2690d112e4210add41910f14c5ba6a927
 2016-02-29 23:49:04 +00:00
Lajos Molnar
6a06474b07 media: switch to using MediaImage2 
Bug: 25684127
Change-Id: Id90f9ef225ae5d988499bca2006d438631f83940
 2016-02-24 18:11:38 -08:00
Jeff Tinker
d4ea5d3eb6 Support AES-CBC sample encryption in MediaDrm 
bug:23719082
Change-Id: I06eb39bd8ad9b55ea0da4011258cac62a8c21ae1
 2016-01-11 17:11:51 -08:00
Jeff Tinker
45eb9b39f4 Extend MediaCodec.CryptoInfo to support Sample AES 
API changes only, implementation to follow

b/23719082

Change-Id: I7cbd0cdf03a8b5b67628cde200c3df6a9253fdbf
 2015-11-05 14:21:25 -08:00
Lajos Molnar
afa6ceb5a0 media: Clarify MediaCodec and CodecCapabilities documentation 
Bug: 21932760
Bug: 22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
 2015-07-31 14:48:47 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-29 15:20:21 -07:00
Jeff Tinker
96a2a957e4 Report specific exception type on decrypt with invalid session 
bug: 22235465
Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
 2015-07-06 14:35:29 -07:00
Lajos Molnar
d8578577b0 media: hook up OnFrameRenderedListener events to framework events 
Bug: 20503131
Change-Id: Ife6d4862d14daf5b9659307af57417bd3532e8fe
 2015-06-08 11:06:53 -07:00
Lajos Molnar
466507eb1c media: Update MediaCodec class description 
Bug: 11990465
Bug: 11019199
Bug: 11990564
Bug: 10672559
Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995
 2015-05-26 19:50:43 +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
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
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00: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
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +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
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
Lajos Molnar
cca7893f52 Merge "media: surface parity for MediaCodec & Recorder" 2015-04-23 13:39:22 +00:00
Lajos Molnar
17d79047c7 media: surface parity for MediaCodec & Recorder 
allow setting output surface dynamically on MediaCodec
allow creating persistent input surface for MediaCodec and MediaRecorder

Bug: 19127604
Bug: 19489395
Change-Id: I68d95ce012574f1cc161556fd7d016be104e5076
 2015-04-23 13:38:39 +00:00
Lajos Molnar
fd81041a63 media: add OnFrameRenderedListener to MediaCodec 
Also allow setting the handler for async callbacks.

Bug: 20503131
Change-Id: If9d24bce75c253a1c7f9c5d41ff5f6447b4622a1
 2015-04-23 13:31:36 +00:00
Lajos Molnar
99f8072386 media: add annotations to low-level Media* classes 
Also remove explicit runtime exception added to
MediaExtractor.setDataSource, as other methods don't
explicitly declare it.

Includes MediaCodec, Crypto, Drm, Extractor, Muxer, Sync.

Bug: 19756615
Bug: 19967103
Bug: 16906375
Change-Id: If511d85af7f61808fbe63fbdc6e04a3d2e7e262c
 2015-04-22 09:44:03 -07:00
Ronghua Wu
9e9ec943ce media: add reason to CodecException ctor. 
Bug: 19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
 2015-04-15 18:00:52 -07:00
Ronghua Wu
0e08a225da Merge "media: Add reason to CodecException." 2015-04-15 01:40:52 +00: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
Ronghua Wu
4c302e8b14 media: add new MediaCodec Callback onCodecReleased. 
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
 2015-04-09 14:47:58 -07:00
Ronghua Wu
1efabd3f89 media: add undocumented exceptions to MediaCodec api. 
Change-Id: Ibfbb136134573aa3ee696a7d853678f4444bbbfd
 2015-03-24 15:50:04 -07:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Lajos Molnar
5037f945cd media: add support for 160-byte image info in MediaCodec 
Some 64-bit compilers now create 160-byte image structures.

Bug: 18513091
Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
 2014-11-24 21:54:27 -08:00
Lajos Molnar
5ea17442c5 MediaCodec/Image: handle null cropRect correctly 
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
 2014-10-27 14:58:26 -07:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2) 
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
 2014-09-24 16:44:47 -07:00
Lajos Molnar
00bbc7d9fa MediaCodec: revalidate cached queued input buffers if queue fails 
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails.  Otherwise, it becomes unusable,
and the buffer still belongs to the user.

In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.

We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).

Bug: 17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
 2014-09-24 14:12:08 -07:00
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Jeff Tinker
a526ba1217 Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev 2014-09-15 23:37:08 +00:00
Jeff Tinker
6998c37139 Document retry behavior for MediaCodec.CryptoException 
bug: 17469693
Change-Id: I8cc204938b28451c638be017ebb499f525fcff50
 2014-09-15 11:47:16 -07:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor 
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
 2014-09-10 17:58:09 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Lajos Molnar
cfc102685c Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 2014-09-05 23:09:33 +00:00
Rachad
8b63a2bf50 Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev 2014-08-30 01:11:36 +00:00
Rachad
c38f9ba81c Tunneled Video Playback: 
Fixed missing AudioHwSync for provided Audio session ID

Bug: 17112525
Change-Id: I89509ada88462d4db7fc37007e0ffaea153da5cd
 2014-08-28 19:02:20 -07:00
Jeff Tinker
336d3eabc0 Add support for max-res decode 
bug: 16034599
Change-Id: I12124aef03518600a27de45bae24eef9c9735be5
 2014-08-29 01:42:48 +00:00
Lajos Molnar
dbf1552d52 MediaCodecInfo: allow getting info for secure codec 
3 minor fixes:
- return correct codec's info from MediaCodec.getCodecInfo()
- treat required features supported
- make feature spec optional in isFormatSupported

Bug: 17154761
Change-Id: Ie98af35ec16caf48a76358fe178f9cc243abad4f
 2014-08-28 06:46:29 -07:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments 
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
 2014-08-27 14:40:02 -07:00
Lajos Molnar
479cc54307 MediaCodec: expand documentation on flush/EOS handling and adaptive playback 
Bug: 11216198
Change-Id: I929954ec381511b9b97e53a91ff6fdff75ca1382
 2014-08-20 15:13:56 -07:00