summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-223-781/+0
| | | | | Bug: 15091253 Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
* camera2: Add HAL1 compatibility shim skeleton.Ruben Brunk2014-05-211-15/+24
| | | | | | | | | | | | | | | | This adds basic support for running the Camera2 API on a device running a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0. This CL includes support for: - N-way preview output streams - N-way jpeg output streams - CameraDevice emulation at the binder interface - Basic camera metadata querying in the CameraManager Bug: 15117269 Bug: 15116722 Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
* 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
| | | | | | | | | | Bug: 14993718 Change-Id: I98989caddcca67c2b3257cead948382fddb066da
* | camera2: Plumb DngCreator to native library.Ruben Brunk2014-05-163-0/+781
|/ | | | Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
* Added MediaCodec.releaseOutputBuffer() method with render timestampLajos Molnar2014-05-092-5/+11
| | | | Bug: 11784827 Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
* am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ | | | | | | | | * commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd': Remove unused LOCAL_LDLIBS.
| * am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| |\ | | | | | | | | | | | | * commit '4463cbc61d0947eccb67a52f60661a92d0cad508': Remove unused LOCAL_LDLIBS.
| | * am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
| | |\ | | | | | | | | | | | | | | | | * commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3': Remove unused LOCAL_LDLIBS.
| | | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
| | | | | | | | | | | | | | | | Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
* | | | Fix buildSelim Gurun2014-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix the java reflection to have the devices boot again. Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
* | | | am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null ↵Marco Nelissen2014-05-011-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | pointer to avoid tombstone crash." * commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f': MetadataRetriever: Check null pointer to avoid tombstone crash.
| * | | am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to ↵Marco Nelissen2014-05-011-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | avoid tombstone crash." * commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468': MetadataRetriever: Check null pointer to avoid tombstone crash.
| | * | am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone ↵Marco Nelissen2014-05-011-0/+7
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | crash." * commit 'ab3977d21161815c130bdedf21e2571382d208da': MetadataRetriever: Check null pointer to avoid tombstone crash.
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the app's vm-heap is not enough, memory allocation for big object like bitmap may failed. This patch add protection for bitmap creating to avoid segment fault error in the following GetIntField function. Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685 Signed-off-by: wang, biao <biao.wang@intel.com> Signed-off-by: TingX Li <tingx.li@intel.com> Signed-off-by: Wang LiangX <liangx.wang@intel.com>
* | | | | am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t ↵Narayan Kamath2014-04-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | parameters to jint" * commit '21ccb07fbe97097b6540097d89dd456447779178': Cast CallVoidMethod's size_t parameters to jint
| * | | | am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to ↵Narayan Kamath2014-04-301-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jint" * commit '414d94059f3559b67b4da25a34de6d5312abe06f': Cast CallVoidMethod's size_t parameters to jint
| | * | | am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"Narayan Kamath2014-04-301-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07': Cast CallVoidMethod's size_t parameters to jint
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset and size variables are passed to set method of MediaCodec.BufferInfo java class. The corresponding actual parameters of set method are of int type in java. These variables are expected to fit in jint as they indicate the offset and size of data in a media codec buffer. The variables are cast to jint, prior to passing to java method, to avoid problems caused by automatic type promotion of parameters when passed to a variadic function, CallVoidMethod. Change-Id: I39e202306f1b7122448c947f6d275f00251bb33a Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| | * | | | 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
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc': mediaeditor shouldn't depend on audioflinger.
| | | * \ \ \ am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51ec4ec51f88d854b182547405e37f3ae74c35bd': Don't assume that size_t is 32-bit
| | | * \ \ \ \ am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store ↵Narayan Kamath2014-03-111-3/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uint32_t value" * commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c': Don't use size_t for variables that store uint32_t value
| | | * \ \ \ \ \ am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of ↵Marco Nelissen2014-03-082-34/+46
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libjhead" into klp-dev * commit 'ac87587875f1dfade5e06a82ccc009d0f0170569': Make MtpDatabase use libexif instead of libjhead
| | | * \ \ \ \ \ \ am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f36104f06755dc2c95b3d7c8bac5312d7572199': libexif is now libjhead
* | | | | | | | | | Merge "ImageReader: remove RAW_SENSOR format translation"Zhijun He2014-04-251-7/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ImageReader: remove RAW_SENSOR format translationZhijun He2014-04-241-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Really not needed to have this, as both native and managed values are matched. Change-Id: I175cbafbf88a80781a478c7aa87471fb977625b6
* | | | | | | | | | | Merge "Remove VideoEditor"Lajos Molnar2014-04-2218-11450/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove VideoEditorLajos Molnar2014-04-2118-11450/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove android.media.videoeditor.* No longer supported and should not be used. Bug: 13542518 Change-Id: I12de122443f0289ab1dfdd8b553e572a830cf412
* | | | | | | | | | | am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when ↵Jeff Tinker2014-04-212-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | released" into klp-modular-dev * commit 'e618f184733e745df4cf86019d23e085559e0f2c': Allow DRM plugins to be destroyed when released
| * | | | | | | | | am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into ↵Jeff Tinker2014-04-212-2/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e': Allow DRM plugins to be destroyed when released
| | * \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 13411994 Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
* | | | | | | | | | | | am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1': MTP: Fix getThumbnail
| * | | | | | | | | | | am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e': MTP: Fix getThumbnail
| | * | | | | | | | | | am ca1f8f6d: am c4367721: MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521': MTP: Fix getThumbnail
| | | * | | | | | | | | MTP: Fix getThumbnailMike Lockwood2014-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thumbnail size was not being passed to the MTP stack so getThumbnail was returning zero length data. Bug: 13747419 Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
| | | * | | | | | | | | Fix a JNI local reference leak in JNIMediaPlayerListener::notify.Elliott Hughes2014-03-071-0/+1
| | | | |_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=62137 b/12603577 Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
* | | | | | | | | | | am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b': frameworks: 64 bit compile issues
| * | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"Mark Salyzyn2014-04-162-10/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '936e87e12dd1335c6f773705fd0a7edb32bc4385': frameworks: 64 bit compile issues
| | * | | | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues) Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
* | | | | | | | | | | am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf': Remove code markers
| * | | | | | | | | | am 6ced3b34: am 0d54e471: Merge "Remove code markers"Dmitriy Ivanov2014-04-152-34/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6ced3b34f02f353c0d3445775132aa9cbf40b160': Remove code markers
| | * | | | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
| * | | | | | | | | am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" ↵Jeff Tinker2014-04-031-4/+4
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c': Add signature|system permission to MediaDrm signer APIs
| | * | | | | | | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also addresses style issues noted in post-submit review from https://googleplex-android-review.git.corp.google.com/#/c/439054/ Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5 related-to-bug: 12702350
* | | | | | | | | | ImageReader: Fix raw buffer size calculation issueZhijun He2014-04-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stride should be used to calculate the size rather than width. Change-Id: I01051fdf4dd2978d56b9998d8bcd542c50458f56
* | | | | | | | | | resolved conflicts for merge of 4f342e87 to masterJeff Tinker2014-04-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
generated by cgit v1.1 at 2025-01-21 21:59:32 +0000