summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ImageReader: remove RAW_SENSOR format translationZhijun He2014-04-241-7/+1
* | | | | | | | | | | Merge "Remove VideoEditor"Lajos Molnar2014-04-2218-11450/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove VideoEditorLajos Molnar2014-04-2118-11450/+1
* | | | | | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when relea...Jeff Tinker2014-04-212-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp...Jeff Tinker2014-04-212-2/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Allow DRM plugins to be destroyed when released" into klp-modular-devJeff Tinker2014-04-212-2/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Allow DRM plugins to be destroyed when releasedJeff Tinker2014-04-112-2/+10
* | | | | | | | | | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | * | | | | | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
| | | | |_|_|/ / / / / | | | |/| | | | | | |
* | | | | | | | | | | am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
* | | | | | | | | | | am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ...Jeff Tinker2014-04-031-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-4/+4
* | | | | | | | | | ImageReader: Fix raw buffer size calculation issueZhijun He2014-04-081-2/+4
* | | | | | | | | | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-031-4/+4