summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
|\
| * mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
* | am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
|\ \ | |/
| * Merge "Don't assume that size_t is 32-bit"Narayan Kamath2014-03-071-3/+3
| |\
| | * Don't assume that size_t is 32-bitAshok Bhat2014-03-061-3/+3
* | | am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-111-3/+3
|\ \ \ | |/ /
| * | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
| |/
* | am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-082-34/+46
|\ \
| * | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
* | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * libexif is now libjheadMarco Nelissen2014-03-061-2/+2
* | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
* | 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: Use long for pointers in media classesAshok Bhat2014-01-159-128/+132
* | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \
| * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
* | | 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
| |/ /
* | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-24/+25
* | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-072-36/+36
* | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-53/+61
* | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-14/+14
* | | 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
| * | ImageReader: get correct crop sizeZhijun He2013-09-161-5/+3
| |/
| * Merge "Remove dependency on JNIHelp header side effects." into klp-devRuben Brunk2013-09-1211-0/+23
| |\
| | * Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-1011-0/+23
| * | ImageReader: Skip size check for BLOB formatZhijun He2013-09-111-7/+14
| * | MediaMuxer: Add setLocation APIZhijun He2013-09-101-0/+15
| |/
| * media: ImageReader throws OutOfResourcesException when out of buffersIgor Murashkin2013-08-271-3/+6
| * ImageReader: Fix API doc table misalignment issueZhijun He2013-08-231-1/+0
| * Merge "Add ability to test supported content types to MediaDrm" into klp-devJeff Tinker2013-08-222-6/+11
| |\
| | * Add ability to test supported content types to MediaDrmJeff Tinker2013-08-212-6/+11
| * | Merge "Fix JNI method called with exception pending" into klp-devJeff Tinker2013-08-161-4/+12
| |\ \ | | |/
| | * Fix JNI method called with exception pendingJeff Tinker2013-08-161-4/+12
| * | media: Fix ImageReader only using maxImages=1 no matter whatIgor Murashkin2013-08-161-2/+17
| |/
| * Merge "Expose MediaCodec.setParameters API to" into klp-devAndreas Huber2013-08-142-0/+30
| |\