| b57dd722f1dc0663417da37d3a82f8283ad3c982 |
|
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
|
| 76f6a86de25e1bf74717e047e55fd44b089673f3 |
|
19-Sep-2015 |
Daniel Micay <danielmicay@gmail.com> |
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| bc10185fa1669a151568feb72277785d323fc344 |
|
14-May-2015 |
Chong Zhang <chz@google.com> |
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
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 4eaa2938084353a54dc259466172909329a048cc |
|
20-Mar-2015 |
Chris Watkins <watk@google.com> |
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
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 46c82b4cd241a447834ed2f5a6be16777b7a990b |
|
30-Nov-2014 |
Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> |
Adjust format strings to work on both 32-bit and 64-bit builds
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>
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 7be24522ce2e1821ad45e7ada7c3f91e6814889a |
|
14-Jul-2014 |
Lajos Molnar <lajos@google.com> |
MediaExtractor: set buffer offset/limit in readSampleData
also fix setting offset/limit in MediaCodec's getBuffer.
Bug: 13008204
Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 37109819d05495184bfcfaea91453d325828ab0b |
|
31-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
Cast CallMethod's size_t parameters to jint
|
| 136c08a7d3678e9fcf22667e75b0904a94add6bb |
|
05-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Cast CallMethod's size_t parameters to jint
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>
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| e78a747d35762c5468c7af4cd80ca60f1b0e0d2e |
|
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
Don't assume that size_t is 32-bit
|
| e92416dfeb115939231819c5edb593b8bb81cc6d |
|
05-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Don't assume that size_t is 32-bit
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>
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| d2506a506303ed94fd1991cf986b825b870a67c5 |
|
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 075e9a19ce645752f8282bc19c91b25978a7dc52 |
|
06-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in media classes
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>
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 87eac99a21772ae56018cb81db6966557b459554 |
|
10-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove dependency on JNIHelp header side effects.
Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| e20a6d5c479909f37af748a81a6e5a5deb7b6e2c |
|
08-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Add support for common encryption
Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| c209a06cfdcf633f12a299245312e3ac32bff27c |
|
24-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Let apps provide a custom data source for extractors
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
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| f86374adec8bd77af7b012f788ea59575296facb |
|
09-May-2012 |
Andreas Huber <andih@google.com> |
Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
sense for the java API.
Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 60d610bf103379277a4b29a7ead4f013f6128e4e |
|
03-May-2012 |
Andreas Huber <andih@google.com> |
Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| f2855b3df5994e165b29025c4c49d8e7d634c034 |
|
26-Apr-2012 |
Andreas Huber <andih@google.com> |
The MediaExtractor can now unselect tracks and has more control over seeking.
Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417
related-to-bug: 6276111
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 74a78b0f6e8c07cfc7da8f043987f6de0648bc05 |
|
20-Apr-2012 |
Andreas Huber <andih@google.com> |
Add the ability to query the amount of cached data to MediaExtractor.
Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371
related-to-bug: 6364341
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| ab57d03bdb3010d4957fb88c8acb30575ca02ec9 |
|
19-Apr-2012 |
Andreas Huber <andih@google.com> |
Fix a typo and choose a reasonable default for crypto-mode (0 would be unencrypted)
Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3
related-to-bug: 6275919
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 91befdc0c4710234840cdfd853e7d30e8f9de62c |
|
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Information required to decrypt buffers is now packaged into MediaCodec.CryptoInfo
New API on MediaExtractor to retrieve a CryptoInfo structure where applicable.
Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d
related-to-bug: 6275919
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 2b9d6bd092ef1d0cc142bf16f671648d1c84c307 |
|
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Make seekTo not throw exceptions.
Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737
related-to-bug: 6276111
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 07ea426e3ae8915ca6bf67135f523f42cd920af0 |
|
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Unhide new media related java APIs.
Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 9b8e496f4d143280deff137c5f30ca8907bc28db |
|
26-Mar-2012 |
Andreas Huber <andih@google.com> |
Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| c52b980277f08aee7981b1fdbca7a89464cf66d9 |
|
12-Mar-2012 |
Andreas Huber <andih@google.com> |
Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.
and MediaExtractor.readSampleData now works with a non-direct byte buffer.
Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|
| 88572f7a3e9d7ef85c26865a0150f3c2041561c2 |
|
21-Feb-2012 |
Andreas Huber <andih@google.com> |
Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
/frameworks/base/media/jni/android_media_MediaExtractor.cpp
|