summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* Merge "camera2: Switch to using YV12 for ImageReader."Ruben Brunk2014-06-201-5/+6
|\
| * camera2: Switch to using YV12 for ImageReader.Ruben Brunk2014-06-201-5/+6
* | Add diagnostic error code to MediaDrm IllegalStateExceptionsJeff Tinker2014-06-201-2/+19
|/
* am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art...Elliott Hughes2014-06-122-14/+10
|\
| * am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."Elliott Hughes2014-06-122-14/+10
| |\
| | * Switch to a type-safe album art interface.Elliott Hughes2014-06-112-14/+10
* | | am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in andro...Elliott Hughes2014-06-091-1/+1
|\ \ \ | |/ /
| * | am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_Medi...Elliott Hughes2014-06-091-1/+1
| |\ \ | | |/
| | * Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.Elliott Hughes2014-06-091-1/+1
* | | resolved conflicts for merge of f8272896 to masterElliott Hughes2014-06-051-6/+7
|\ \ \ | |/ /
| * | am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."Elliott Hughes2014-06-051-6/+7
| |\ \ | | |/
| | * [LP64] Fix access to MediaAlbumArt.Elliott Hughes2014-06-051-6/+7
* | | am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrec...Mike Lockwood2014-06-021-1/+1
|\ \ \ | |/ /
| * | am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name...Mike Lockwood2014-06-021-1/+1
| |\ \ | | |/
| | * am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
| | |\
| | | * MtpDatabase JNI: Fixed incorrect method name in ALOGE.Martin Blumenstingl2014-05-311-1/+1
* | | | am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory...Mike Lockwood2014-06-021-4/+2
|\ \ \ \ | |/ / /
| * | | am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getO...Mike Lockwood2014-06-021-4/+2
| |\ \ \ | | |/ /
| | * | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectProperty...Mike Lockwood2014-06-021-4/+2
| | |\ \ | | | |/
| | | * MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().Martin Blumenstingl2014-05-311-4/+2
| * | | am a034dac7: android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-05-301-1/+1
| |\ \ \
| | * | | android_media_MediaMuxer_setLocation: amended signature.Robert Shih2014-05-301-1/+1
* | | | | camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-223-781/+0
* | | | | camera2: Add HAL1 compatibility shim skeleton.Ruben Brunk2014-05-211-15/+24
* | | | | Merge "Fix 64 bit long pointer size for media scanning"Andy Hung2014-05-201-1/+1
|\ \ \ \ \
| * | | | | Fix 64 bit long pointer size for media scanningAndy Hung2014-05-191-1/+1
* | | | | | camera2: Plumb DngCreator to native library.Ruben Brunk2014-05-163-0/+781
|/ / / / /
* | | | | Added MediaCodec.releaseOutputBuffer() method with render timestampLajos Molnar2014-05-092-5/+11
* | | | | am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
* | | | | Fix buildSelim Gurun2014-05-071-2/+2
* | | | | am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null p...Marco Nelissen2014-05-011-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avo...Marco Nelissen2014-05-011-0/+7
| |\ \ \ \ | | |/ / /
| | * | | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ...Marco Nelissen2014-05-011-0/+7
| | |\ \ \ | | | |/ /
| | | * | Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."Marco Nelissen2014-05-011-0/+7
| | | |\ \
| | | | * | MetadataRetriever: Check null pointer to avoid tombstone crash.wang, biao2014-04-091-0/+7
* | | | | | am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t p...Narayan Kamath2014-04-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ...Narayan Kamath2014-04-301-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Cast CallVoidMethod's size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | | |\ \ \
| | | | * | | Cast CallVoidMethod's size_t parameters to jintAshok Bhat2014-03-061-1/+1
| | * | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-292-34/+46
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."Glenn Kasten2014-03-191-1/+0
| | | |\ \ \ \
| | | * \ \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store u...Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libj...Marco Nelissen2014-03-082-34/+46
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
* | | | | | | | | | | Merge "ImageReader: remove RAW_SENSOR format translation"Zhijun He2014-04-251-7/+1
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-14 03:58:55 +0000