summaryrefslogtreecommitdiff
path: root/media/java/android/media/MediaCodec.java
AgeCommit message (Collapse)Author
2018-08-23Fix a typo in javadoc.Dongwon Kang
Test: javadoc fix. Bug: 112882126 Change-Id: I69f55aaa49103690a796ff394fcd1934891a52f2
2018-08-17Add @UnsupportedAppUsage annotationsMathew Inwood
For packages: android.media.tv android.media.soundtrigger android.media.session android.media.projection android.media.midi android.media.effect.effects android.media.effect android.media.browse android.media.audiopolicy android.media.audiofx android.media This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: I9b58cb2d1e02d9156a7b0d19c1feff4bcd2c53a9 Merged-In: I3bd40136d7fc948f66eca6b2d139c15e39c5a248
2018-05-30Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-devRobert Shih
2018-05-25MediaCodec.CryptoInfo: expose subsample encryption patternRobert Shih
Bug: 31215085 Test: com.google.android.media.gts.WidevineMp4TempTests Change-Id: I6965adc646684053633530e39258b171724b34bc
2018-05-16Add a hidden flag to indicate exif data block.Chong Zhang
bug: 79476308 Change-Id: Ib86e7bd718fe54a4e3e265ce8644706038f1444c
2018-04-06media: Populate Image scaling mode in reader and writerEmilian Peev
"ImageReader" and "ImageWriter" must pass information about the specific buffer scaling mode. Bug: 76022384 Test: Manual using application, Camera CTS Change-Id: I116f00cbf3b1487d8e44661e8fd15e2aa16e6e0d
2018-03-22Document CryptoInfo Settings for CENC 2016 & HLS AudioJohn W. Bruce
Adds additional documentation that clarifies how to set up CryptoInfo objects for CENC 2016 decryption schemes, in particular for the case of HLS SAMPLE-AES Audio. Bug: 62503021 Test: make docs Change-Id: Ia21ef62a4144e7b41b0216ba0b968ff6c52d0297
2018-03-20Merge "Camera: Populate Image tranformation in reader and writer" into pi-devTreeHugger Robot
2018-03-19Camera: Populate Image tranformation in reader and writerEmilian Peev
"ImageReader" and "ImageWriter" must pass information about the specific buffer transformation. Currently only the "ImageReader" implementation of the "android.media.Image" abstract classs will populate the corresponding transformation, the remaining implementations will use the default identity tranformation. Bug: 75316204 Test: Manual using test application, Camera CTS Change-Id: If5c12134fbbef8cc20c3d369986ba613bc4f2cec
2018-03-15fix slow get caps -- DO NOT MERGEChong Zhang
When get caps is called on an MediaCodec object, try to use the codec info for that MediaCodec first as it should be available during codec construction. Only when that somehow failed go and initialize the full MediaCodecList, as building the entire list could be very slow. And when cloning the CodecCapabilities from MediaCodecInfo, copy the fields directly and the fields (other than the ones modifiable by client) are immutable after construction. bug: 74073607 Test: CTS media post submit: cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice Change-Id: I4ae5f2431da8528e1eca093c5cfb98abcb4a5bbf (cherry picked from commit 90d7304a83ea1758ac2f7a9293d4790a1a28eb4e)
2017-06-23cas: convert MediaCas to HIDLChong Zhang
- Replace AIDL interfaces with corresponding HIDL ones. bug: 22804304 Change-Id: I8c552ce6fc3766715cd1bc0ea05c0988d56f590e
2017-06-16MediaCodec: add more details for FLAC CSD.Wei Jia
Test: developer page shows correct content Bug: 37787245 Bug: 37794552 Change-Id: If8fc2cd5c340169c01c4c1bc93a314f963b40e45
2017-06-02Merge "MediaCodec: add CSD description for FLAC"Wei Jia
2017-06-01Merge "Update documentation of MediaCodec regarding partial frame." into ↵Dongwon Kang
oc-dev am: 878fc6a81c am: 1948af7bd0 Change-Id: I9970625b727502eb85a888eab0867e9b583abda1
2017-05-31Update documentation of MediaCodec regarding partial frame.Dongwon Kang
Test: documentation update Bug: 62202844 Change-Id: Ie1e269e7e22206001a145e9c7ee6f92d7e8633e1
2017-05-24MediaCodec: add CSD description for FLACWei Jia
Test: developer page shows correct content Bug: 37787245 Bug: 37794552 Change-Id: I955dc3bf730f91653b2622aa0b2e7f1c1c867a72
2017-04-15Merge "Rework getMetrics() api per API council" into oc-dev am: abbea1df6bRay Essick
am: b3934d9043 Change-Id: I0f463f2d04da9a5ecd8ddcad965ce8821b0ee116
2017-04-14Rework getMetrics() api per API councilRay Essick
Reworking the media metrics getMetrics() calls (currently in MediaCodec, MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction from the API Council. Drop the MediaMetricsSet that we had in the first round; go back to a PersistableBundle as the return type. Moves the key definitions from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants Bug: 37083862 Test: ran the corresponding CTS tests Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
2017-03-29Merge "Avoid unnecessary object allocation in CryptoInfo.set"Oliver Woodman
2017-03-29Avoid unnecessary object allocation in CryptoInfo.setOliver Woodman
This is causing a large number of unnecessary small object allocations during encrypted playbacks, which presumably all need to be GC'd. I wasn't sure whether the zero pattern should be static; that might be objectionable in the platform (unsure?), since it would live forever from the point of the class being classloaded. It doesn't make much/any difference in practice in any case. Test: Safe refactoring CL. Change-Id: I9ee5fe284b0f854d672d83b97fc51116b0416f91
2017-03-24MediaCas: rethrow MediaCas specific exceptionChong Zhang
Translate ServiceSpecificException from aidl to CAS-specific exceptions. Also, throw CAS specific exception for descramble(). bug: 22804304 Change-Id: I6d68c335c87fbb95fd8cc227e432eed4e5951550
2017-03-15Integrate API Council feedback into Media Metrics APIsRay Essick
Integrates the API Council's feedback into the Media Metrics related APIs. -- return types for the getMetrics() calls -- definition of keys in the set of data that comes back Bug: 35811992 Test: booted, CTS subset, checked dumpsys media.metrics output Change-Id: Ib750f9631bd3453be3132760273ccfff0a891f88
2017-03-01Javadoc for the recently added getMetrics()Ray Essick
Add javadoc comments for the getMetrics() functions that we've added to android.media.Media{Codec,Extractor,Player}. This describes the currently implemented functionality. Bug: 35096098 Test: Compilation
2017-02-22MediaCas: add framework APIsChong Zhang
Java API changes to support MediaCas framework. Also add partial-frame related enums to MediaCodec, MediaCodecInfo, and MediaExtractor as a way to indicate a input frame contains partial data. Test: basic test app and test plugin to execise the code path; impelenting playback of CAS-secured MPEG2TS streams, including a Widevine-based CAS plugin, locally modified ExoPlayer and Android TV Tuner input. bug: 22804304 Change-Id: Ia4ba1d4046f7588e42bfb21e726390457d2fc8e3
2017-01-27API access to mediametricsRay Essick
provide SDK/API access to media metrics for user apps. This lets the apps metrics data for their instances of player and codecs. Others to come. Bug: 34715803 Test: booted, invoked new APIs to verify desired results Change-Id: Iaae6406aadef30adc893952961ac154a7c4c761d
2016-06-28media: clarify notes in MediaCodec docLajos Molnar
Bug: 23709311 Change-Id: I4af683a8f43db29fa5a777832a659a6c43a7a8d1
2016-06-28Merge \"media: document rotation and scaling issues for MediaCodec\" into ↵Lajos Molnar
nyc-dev am: af9d9f9b3e Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb
2016-06-28media: document rotation and scaling issues for MediaCodecLajos Molnar
Bug: 23709311 Bug: 28512795 Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
2016-06-28media: document VP9 CSD for MediaCodecLajos Molnar
Also document that concatenated CSD is only supported for AVC. Bug: 10672559 Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
2016-06-24media: document output image crop and layout for MediaCodecLajos Molnar
These use hidden, now deprecated MediaFormat keys. Bug: 14127601 Change-Id: Ib51e4ef41204c9be34ad571300fcb7860feb504e
2016-04-25clarify MediaCodec.setVideoScalingMode behaviorLajos Molnar
Bug: 28131249 Change-Id: I4fd3a5333cbdc0ebec683c9a43ce071478a79d90
2016-03-05Add error code to MediaCodec.CryptoExceptionJeff Tinker
Added a code to represent unsupported operations bug: 25929554 Change-Id: Id8bfa092f29de073db19c4d7444f89249ea2cdd5
2016-03-01Merge "Add javadocs to MediaCodec.CryptoInfo methods" into nyc-devJeff Tinker
2016-02-29Add javadocs to MediaCodec.CryptoInfo methodsJeff Tinker
bug:27383993 Change-Id: I11bba4a2690d112e4210add41910f14c5ba6a927
2016-02-24media: switch to using MediaImage2Lajos Molnar
Bug: 25684127 Change-Id: Id90f9ef225ae5d988499bca2006d438631f83940
2016-01-11Support AES-CBC sample encryption in MediaDrmJeff Tinker
bug:23719082 Change-Id: I06eb39bd8ad9b55ea0da4011258cac62a8c21ae1
2015-11-05Extend MediaCodec.CryptoInfo to support Sample AESJeff Tinker
API changes only, implementation to follow b/23719082 Change-Id: I7cbd0cdf03a8b5b67628cde200c3df6a9253fdbf
2015-07-31media: Clarify MediaCodec and CodecCapabilities documentationLajos Molnar
Bug: 21932760 Bug: 22847191 Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
2015-07-29Change MNC codename to just M.Dianne Hackborn
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-06Report specific exception type on decrypt with invalid sessionJeff Tinker
bug: 22235465 Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
2015-06-08media: hook up OnFrameRenderedListener events to framework eventsLajos Molnar
Bug: 20503131 Change-Id: Ife6d4862d14daf5b9659307af57417bd3532e8fe
2015-05-26media: Update MediaCodec class descriptionLajos Molnar
Bug: 11990465 Bug: 11019199 Bug: 11990564 Bug: 10672559 Change-Id: I22533dec98fb878ca87876c9ebc0fe59f4bfe995
2015-05-13media: rename MediaCodec.setSurface to setOutputSurfaceLajos Molnar
Bug: 21045402 Change-Id: Ie57880af6ce6feea9713360b094f2b198d3c119e
2015-05-13Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into ↵Chong Zhang
mnc-dev
2015-05-13MediaCodec: rename usePersistentInputSurface to setInputSurfaceChong Zhang
bug: 21045402 Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
2015-05-08media: merge CodecException's getErrorCode and getReason.Ronghua Wu
And unhide getErrorCode. Bug: 20950388 Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
2015-05-06Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-devJeff Tinker
2015-05-05Clarify wording of MediaCrypto exception "ERROR_NO_KEY"Jeff Tinker
related-to-bug: 20857014 Change-Id: I13204528ec44cda76a721f4d9f6021c1435921ac
2015-05-02Merge "media: hook up MediaCodec.setSurface" into mnc-devLajos Molnar
2015-05-01MediaCodec: implement persistent input surface APIsChong Zhang
Bug: 19127604 Bug: 19489395 Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a