summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."Mike Lockwood2014-06-021-1/+1
|\ | | | | | | | | * commit '1c725866da02c3e1f62fb416ea3450caed406f2a': MtpDatabase JNI: Fixed incorrect method name in ALOGE.
| * MtpDatabase JNI: Fixed incorrect method name in ALOGE.Martin Blumenstingl2014-05-311-1/+1
| | | | | | | | Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
* | am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in ↵Mike Lockwood2014-06-021-4/+2
|\ \ | |/ | | | | | | | | | | getObjectPropertyValue()." * commit '27eb205e21e7715764084085f382d690e0406c63': MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
| * MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().Martin Blumenstingl2014-05-311-4/+2
| | | | | | | | | | | | | | | | | | | | The jstring "stringValue" was not never freed. In the case where "str" was NULL the whole cleanup part (see "goto out") was even skipped. This patch makes getObjectPropertyValue() behave like getObjectPropertyList(). Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
* | 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
* | 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 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
| | * | | | | | Make MtpDatabase use libexif instead of libjheadMarco Nelissen2014-03-072-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12203995 Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
| * | | | | | | am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-devMarco Nelissen2014-03-071-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | | * commit '4f36104f06755dc2c95b3d7c8bac5312d7572199': libexif is now libjhead
| | * | | | | libexif is now libjheadMarco Nelissen2014-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/12203995 Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
* | | | | | | frameworks: 64 bit compile issuesMark Salyzyn2014-04-162-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues) Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
* | | | | | | Remove code markersDmitriy Ivanov2014-04-152-34/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
* | | | | | Merge "Cast CallMethod's size_t parameters to jint"Narayan Kamath2014-03-311-2/+2
|\ \ \ \ \ \
| * | | | | | Cast CallMethod's size_t parameters to jintAshok Bhat2014-03-251-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid problems caused by automatic type promotion of parameters when passed to a variadic function. Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | jni: 64-bit compile issueMark Salyzyn2014-03-261-5/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switch to PRId64 - some unused parameter warning suppression Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
* | | | | mediaeditor shouldn't depend on audioflinger.Narayan Kamath2014-03-191-1/+0
| |_|_|/ |/| | | | | | | | | | | Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
* | | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Crypto data was being copied to java jint array in chunks of size_t. This will not work on LP64 as size_t will be 64-bit. This patch changes copy to use int32_t chunks instead of size_t. Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Don't use size_t for variables that store uint32_t valueAshok Bhat2014-03-061-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local variables width, height, displayWidth and displayHeight are set to the corresponding members of VideoFrame class. As the members of VideoFrame are uint32_t, the local variables have been changed to uint32_t. As these local variables are passed to a java method, the change of size_t to uint32_t ensures that the size of the actual parameter (i.e uint32_t) is now same as the size of the formal parameter (i.e. jint) for all platforms. Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | | | | | | | | | | | | | | | android_media_MediaMuxer_native_setup should return jlong. It was incorrectly returning jint. Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JNI buffer in ImageReader_imageSetup is not released when it fails to acquire graphics buffer. After all JNI buffers are exhausted, ACQUIRE_MAX_IMAGES will be returned and leads to error. The JNI buffer should be released when it fails to acquire graphics buffer. Change-Id: I3319a58ac44e36c8593b404672a685c4b589a735
* | | AArch64: Make graphics classes 64-bit compatibleAshok Bhat2014-01-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | AArch64: Use long for pointers in media classesAshok Bhat2014-01-159-128/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | Merge "Add NULL check in updateProxyConfig"Marco Nelissen2014-01-141-8/+11
|\ \
| * | Add NULL check in updateProxyConfigOscar Rydhé2013-12-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | If the exclusionList was null in updateProxyConfig the VM would crash when converting it to a UTF8 string. Avoid this by adding a null check. Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
* | | 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
| |/ / | | | | | | | | | | | | | | | | | | | | | A reference leak was found in the subtitle usecase that also applies to android_media_MediaDrm.cpp (Code taken from the similar fix in android_media_MediaPlayer.cpp) Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
* | | AArch64: Use long for pointers in MTP classesAshok Bhat2014-01-073-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in MTP classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | AArch64: Use long for pointers in VideoEditor classesAshok Bhat2014-01-072-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in VideoEditor classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | AArch64: Use long for pointers in audio effect classesAshok Bhat2014-01-072-53/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AudioEffect and Visualizer classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | AArch64: Use long for pointers in AmrInputStreamAshok Bhat2014-01-071-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in AmrInputStream class, as native pointers can be 64-bit. Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | 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
| | | | | | | | | | | | | | | | | | Therefore, we must use SetLongField and not SetIntField. Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
* | | Remove unused field from MediaMuxerNarayan Kamath2013-12-181-7/+0
|/ / | | | | | | Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
* | AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-102-18/+18
| | | | | | | | | | | | | | | | For storing pointers, long is used in MediaDrm and MediaMuxer classes, as native pointers can be 64-bit. Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2222-176/+1248
|\ \ | |/ | | | | Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
| * Fix hangMarco Nelissen2013-09-251-1/+1
| | | | | | | | | | | | b/10855561 Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
| * Add audio level monitoring capabilities in Visualizer effectJean-Michel Trivi2013-09-231-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | Extend the visualizer audio effect with the capability to query peak and RMS values for the currently playing audio. Values are expressed in mB and are retrieved as an array of int values in the native layer, and written directly as object fields for the JNI. Bug 8413913 Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
| * ImageReader: disable NV21 supportZhijun He2013-09-181-3/+8
| | | | | | | | | | Bug: 10787131 Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
generated by cgit v1.1 at 2025-03-22 21:14:36 +0000