summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Throw an exception instead of crash when a surface does not have a binding ↵James Dong2012-10-041-0/+5
| | | | | | | | surface texture o related-to-bug: 7270329 Change-Id: I498d72187968e89d9498d01b10719569e12be2af
* MtpDatabase: Use actual file size instead of media database size columnMike Lockwood2012-09-121-27/+29
| | | | | | | | | | Fixes problems with file transfer from device to host that can occur if the database size value is wrong. Bug: 6954446 Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be Signed-off-by: Mike Lockwood <lockwood@google.com>
* Add plumbing for new surface flinger display API.Jeff Brown2012-08-272-2/+2
| | | | | | | | | | | | | | Cleaned up the implementation of Surface and SurfaceSession to use more consistent naming and structure. Added JNI for all of the new surface flinger display API calls. Enforced the requirement that all Surfaces created by the window manager be named. Updated the display manager service to use the new methods. Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
* Let apps provide a custom data source for extractorsMarco Nelissen2012-08-242-0/+102
| | | | | | | | 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
* am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
|\ | | | | | | | | * commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450': To avoid the JNI memory leaks in video editor codes
| * To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a protential memory leak in video editor JNI codes. When importing so many video clips, the number of local reference will exceed 512, which will cause the Dalvik virtual machine crash. The patch will free each local reference when it's no longer used to avoid memory leaks. Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40 Author: Wei Feng <wei.feng@intel.com> Signed-off-by: Wei Feng <wei.feng@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 40786
* | am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that ↵Jean-Baptiste Queru2012-08-131-1/+4
|\ \ | |/ | | | | | | | | | | does not exist" * commit '4da3769d30851f0b517a688a5c835715d7d0b0bf': mediacodec: Don't crash if trying to open a codec that does not exist
| * mediacodec: Don't crash if trying to open a codec that does not existMartin Storsjo2012-08-131-1/+4
| | | | | | | | Change-Id: If75e3156517993629f50622a84a9ac573fced815
* | Changed to obtain a parcel in each notify() call in jni.Insun Kang2012-07-101-8/+4
|/ | | | | Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85 related-to-bug: 6785452
* Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.soJames Dong2012-06-122-0/+190
| | | | | Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a related-to-bug: 6647465
* rename exif to exif_jni due to refactoring in external/jheadKeun young Park2012-06-071-0/+3
| | | | | | | - also pull libexif_jni from media_jni Bug: 6623618 Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
* Fixed a buffer overflow issueJames Dong2012-05-291-3/+8
| | | | | | | | The allocated array has one byte less than the required length. Allocating the size one byte larger fixes the issue. contribution was originally from teng.hong@nxp.com Change-Id: I3aa2e6b995fd18e30649a34f201646082aab44ee related-to-bug: 6347465
* Remove dependency of libvideoeditor_jni.so on static libs from video editor ↵James Dong2012-05-161-16/+10
| | | | | | | | engine related-to-bug: 6502980 Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
* Revert "Remove dependency of libvideoeditor_jni.so on static libs from video ↵James Dong2012-05-151-10/+16
| | | | | | editor engine" This reverts commit cbaa821b7f286a54767cc8bc549504ea2ed86e4d.
* Remove dependency of libvideoeditor_jni.so on static libs from video editor ↵James Dong2012-05-151-16/+10
| | | | | | | | engine related-to-bug: 6328360 Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
* Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into ↵James Dong2012-05-111-8/+14
|\ | | | | | | jb-dev
| * Improve notifying TimedText by reducing marshall/unmarshalling.Insun Kang2012-05-091-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | o Removes mParcel from TimedText class. o Converts native parcel into java parcel object directly without copying to an intermediate byte array. o JNIMediaPlayerListener::notify checks for Java exceptions, logs them, and clears the exception state. related-to-bug: 6405934 Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
* | Make sure crop rect information is visible from java.Andreas Huber2012-05-101-0/+48
| | | | | | | | | | Change-Id: Ib914de3d42349efcd7af301d43bec82a21d24ce5 related-to-bug: 6471684
* | 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
* Return codec buffers that are marked as having host endianness.Andreas Huber2012-05-081-0/+27
| | | | | Change-Id: Iedfd829d108e65ee368909af14ace68b63e0e168 related-to-bug: 6364139
* Various changes to Media* APIs requested by the api council.Andreas Huber2012-05-034-19/+19
| | | | | Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340 related-to-bug: 6432753
* New API to set the video rendering mode on a MediaCodec instance.Andreas Huber2012-04-302-2/+40
| | | | | Change-Id: I6d765bb4cab7bcf29f09364293c24e8a6930078b related-to-bug: 6364139
* The MediaExtractor can now unselect tracks and has more control over seeking.Andreas Huber2012-04-262-6/+39
| | | | | Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417 related-to-bug: 6276111
* am b4781b9b: am ea8ceca8: am 90577af7: Merge "use utf8_length() instead of ↵Dianne Hackborn2012-04-241-48/+5
|\ | | | | | | | | | | | | local function, isValidUtf8()" * commit 'b4781b9b489bc8b0049e1e92b7ab00e32b02b12c': use utf8_length() instead of local function, isValidUtf8()
| * use utf8_length() instead of local function, isValidUtf8()Homin Lee2012-04-131-48/+5
| | | | | | | | | | | | | | | | | | utf8_length() from libutils returns -1 when source not contains valid sequence for UTF-8. Fixed to use it and removed the local function isValidUtf8(). Change-Id: If2834ce1d1ae07fd8526ce8bc5df3fd3f44e85c8 Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
| * Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-1913-174/+174
| | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
| * Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-195-10/+10
| | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
| * Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-192-2/+2
| | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
| * Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-191-3/+3
| | | | | | | | Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
| * Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-1911-232/+232
| | | | | | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* | Add the ability to query the amount of cached data to MediaExtractor.Andreas Huber2012-04-202-0/+48
| | | | | | | | | | Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371 related-to-bug: 6364341
* | DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clientsAndreas Huber2012-04-192-11/+50
| | | | | | | | | | | | | | through a custom exception "MediaCodec.CryptoException". Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1 related-to-bug: 6365261
* | Merge "Add support for scaling mode parameter in Visualizer effect"Jean-Michel Trivi2012-04-191-0/+23
|\ \
| * | Add support for scaling mode parameter in Visualizer effectJean-Michel Trivi2012-04-171-0/+23
| | | | | | | | | | | | | | | | | | | | | Add set/get methods to set how the Visualizer scales the captured data. Change-Id: Ia1da00fd5474dd3484b59caf7d1d0a812d0347de
* | | 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-183-8/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MediaCrypto's constructor can throw RuntimeException.Andreas Huber2012-04-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5 related-to-bug: 6275919
* | | Unhide new media related java APIs.Andreas Huber2012-04-168-42/+130
|/ / | | | | | | Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
* | Merge "Fix failure from setDataSource(String path) when path is a local file"James Dong2012-04-121-8/+0
|\ \
| * | Fix failure from setDataSource(String path) when path is a local fileJames Dong2012-04-121-8/+0
| | | | | | | | | | | | | | | | | | | | | o the failure was because the mediaserver does not have read permission to sdcard o related-to-bug: 6325960,6322913 Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
* | | Fix thumbnail generation failureJames Dong2012-04-111-9/+0
|/ / | | | | | | | | | | | | | | | | | | o Change the impl of MediaMetadataRetriever.setDataSource(String). It opens and passes an fd to the media framework rather than pass the file path directly to the media server. The change is needed since media server does not have read permission to sdcard o Remove the unnecessary jni method Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
* | New JAVA API to support submitting encrypted buffers of input data.Andreas Huber2012-04-062-0/+149
| | | | | | | | | | Change-Id: Ib0df9a9427b4580946179860495b26f743558597 related-to-bug: 6275919
* | New Crypto JAVA class to facilitate decryption via MediaCodec.Andreas Huber2012-04-046-3/+371
| | | | | | | | | | Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034 related-to-bug: 6275919
* | More DRM/crypto support.Andreas Huber2012-04-031-2/+3
| | | | | | | | | | related-to-bug: 6275919 Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
* | New API to query available codecs and their capabilities.Andreas Huber2012-04-023-0/+197
| | | | | | | | Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
* | frameworks base Android.mk file changesJames Dong2012-03-283-10/+7
| | | | | | | | Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
* | Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-263-1/+31
|\ \
| * | Provisional support for secure decryption of media streams.Andreas Huber2012-03-263-1/+31
| | | | | | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-266-1331/+5
|\ \ \ | |/ / |/| |