summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_MediaExtractor.cpp
Commit message (Collapse)AuthorAgeFilesLines
* MediaDataSource: address API council commentsChong Zhang2015-05-141-0/+5
| | | | | | | | | | | | - throw IOExecption on fatal errors - add offset argument to readAt - and fix a crash in MediaExtractor bug: 21045118 bug: 21163225 Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
* Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-151-70/+4
| | | | | | | | | | | | | | | | | | | | 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
* Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-051-1/+1
| | | | | | | | Adjust format strings to not produce Clang warnings in both 32-bit and 64-bit builds Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* MediaExtractor: set buffer offset/limit in readSampleDataLajos Molnar2014-07-151-4/+24
| | | | | | | also fix setting offset/limit in MediaCodec's getBuffer. Bug: 13008204 Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
* am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t ↵Narayan Kamath2014-03-311-2/+2
|\ | | | | | | | | | | | | parameters to jint" * commit '303d666f2e2b37120e0e9de206ce127e2a532026': Cast CallMethod's size_t parameters to jint
| * Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
| | | | | | | | | | | | | | | | This will avoid problems caused by automatic type promotion of parameters when passed to a variadic function. Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume ↵Narayan Kamath2014-03-071-3/+3
|\ \ | |/ | | | | | | | | | | that size_t is 32-bit" * commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265': Don't assume that size_t is 32-bit
| * Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
| | | | | | | | | | | | | | | | | | Crypto data was being copied to java jint array in chunks of size_t. This will not work on LP64 as size_t will be 64-bit. This patch changes copy to use int32_t chunks instead of size_t. Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-6/+21
|/ | | | | | to media code Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
* AArch64: Use long for pointers in media classesAshok Bhat2014-01-151-35/+35
| | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-101-0/+1
| | | | | Bug: 10680559 Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
* Add support for common encryptionMarco Nelissen2013-04-081-0/+35
| | | | Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
* Let apps provide a custom data source for extractorsMarco Nelissen2012-08-241-0/+100
| | | | | | | | Adds android.media.DataSource, which is modeled after its native namesake, and a new method on MediaExtractor that lets apps specify their implementation of a DataSource as the source of data for the extractor. Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
* Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes noAndreas Huber2012-05-091-1/+1
| | | | | | | sense for the java API. Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774 related-to-bug: 6276111
* Various changes to Media* APIs requested by the api council.Andreas Huber2012-05-031-5/+5
| | | | | Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340 related-to-bug: 6432753
* The MediaExtractor can now unselect tracks and has more control over seeking.Andreas Huber2012-04-261-5/+36
| | | | | Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417 related-to-bug: 6276111
* Add the ability to query the amount of cached data to MediaExtractor.Andreas Huber2012-04-201-0/+46
| | | | | Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371 related-to-bug: 6364341
* Fix a typo and choose a reasonable default for crypto-mode (0 would be ↵Andreas Huber2012-04-181-2/+3
| | | | | | | unencrypted) Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3 related-to-bug: 6275919
* Information required to decrypt buffers is now packaged into ↵Andreas Huber2012-04-181-1/+142
| | | | | | | | | MediaCodec.CryptoInfo New API on MediaExtractor to retrieve a CryptoInfo structure where applicable. Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d related-to-bug: 6275919
* Make seekTo not throw exceptions.Andreas Huber2012-04-171-6/+1
| | | | | Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737 related-to-bug: 6276111
* Unhide new media related java APIs.Andreas Huber2012-04-161-12/+68
| | | | Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
* Provisional support for secure decryption of media streams.Andreas Huber2012-03-261-0/+29
| | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.Andreas Huber2012-03-121-4/+31
| | | | | | and MediaExtractor.readSampleData now works with a non-direct byte buffer. Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
* Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-221-0/+400
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
generated by cgit v1.1 at 2024-06-09 14:42:21 +0000