summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\
| * Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-061-47/+0
|\ \
| * | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-051-47/+0
* | | Merge "android_media_MediaMuxer_setLocation: amended signature."Robert Shih2014-02-051-1/+1
|\ \ \ | |/ / |/| |
| * | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-02-051-1/+1
* | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-047-14/+296
|/ /
* | am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it f...Zhijun He2014-01-311-0/+1
|\ \ | |/
| * Merge "Release locked buffer when it fails to acquire graphics buffer"Zhijun He2014-01-301-0/+1
| |\
| | * Release locked buffer when it fails to acquire graphics bufferlina.x.pi2014-01-281-0/+1
| * | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
| |/
* | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
* | API that allows usage of MediaCodec APIs without polling.Andreas Huber2014-01-272-12/+135
* | Revert "AArch64: Make graphics classes 64-bit compatible"Narayan Kamath2014-01-271-2/+2
* | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-271-2/+2
* | Check that the exif bits are actually thereMarco Nelissen2014-01-221-2/+2
* | Resolved conflicts for merge of 28c6ec02 to masterNarayan Kamath2014-01-169-128/+132
|\ \ | |/
| * AArch64: Use long for pointers in media classesAshok Bhat2014-01-159-128/+132
* | am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add N...Marco Nelissen2014-01-141-8/+11
|\ \ | |/
| * Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
| |\
| | * Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | libjhead_jni is still neededMarco Nelissen2014-01-131-0/+3
* | | am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a...Jason Sams2014-01-111-0/+1
|\ \ \ | |/ /
| * | Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
| |\ \
| | * | Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | |/
* | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-01-102-37/+46
* | | am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch...Narayan Kamath2014-01-073-24/+25
|\ \ \ | |/ /
| * | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-24/+25
* | | am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch...Narayan Kamath2014-01-072-36/+36
|\ \ \ | |/ /
| * | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-072-36/+36
* | | am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch...Narayan Kamath2014-01-072-53/+61
|\ \ \ | |/ /
| * | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-53/+61
* | | am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch...Narayan Kamath2014-01-071-14/+14
|\ \ \ | |/ /
| * | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-14/+14
* | | MediaRecorder: add getSurface() api and SURFACE video sourceChong Zhang2014-01-061-0/+21
* | | Merge "libexif is now libjhead"Marco Nelissen2013-12-191-2/+2
|\ \ \ | |/ / |/| |
| * | libexif is now libjheadMarco Nelissen2013-12-191-2/+2
* | | Merge "MediaDrm#mNativeContext is a long, not int."Narayan Kamath2013-12-191-1/+1
|\ \ \ | |_|/ |/| |
| * | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
| |/
* | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-7/+0
|/
* AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-18/+18
* Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2222-176/+1248
|\
| * Fix hangMarco Nelissen2013-09-251-1/+1
| * Add audio level monitoring capabilities in Visualizer effectJean-Michel Trivi2013-09-231-0/+72
| * ImageReader: disable NV21 supportZhijun He2013-09-181-3/+8
| * ImageReader: fix the 0 crop rect size issueZhijun He2013-09-161-1/+1
| * Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into k...Igor Murashkin2013-09-161-18/+17
| |\
| | * media: Update ImageReader to remove MaxImagesAcquiredExceptionIgor Murashkin2013-09-131-18/+17
| * | Merge "media: Update ImageReader APIs" into klp-devIgor Murashkin2013-09-161-4/+4
| |\ \ | | |/
| | * media: Update ImageReader APIsIgor Murashkin2013-09-121-4/+4