drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,929 Commits 1 Branch 0 Tags
Commit Graph

75 Commits

Author SHA1 Message Date
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
wfeng6
c96a7294a4 To avoid the JNI memory leaks in video editor codes 
There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.

Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
 2012-08-17 10:22:57 +08:00
James Dong
c6693f6fee Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so 
Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a
related-to-bug: 6647465
 2012-06-12 14:05:14 -07:00
James Dong
54c40e033e Fixed a buffer overflow issue 
The allocated array has one byte less than the required length. Allocating the size one byte larger fixes the issue.
contribution was originally from teng.hong@nxp.com

Change-Id: I3aa2e6b995fd18e30649a34f201646082aab44ee
related-to-bug: 6347465
 2012-05-29 18:08:51 -07:00
James Dong
5ddb19e530 Remove dependency of libvideoeditor_jni.so on static libs from video editor engine 
related-to-bug: 6502980

Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
 2012-05-16 01:04:40 -07:00
James Dong
f20e4f4b1a Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" 
This reverts commit cbaa821b7f286a54767cc8bc549504ea2ed86e4d.
 2012-05-15 14:51:52 -07:00
James Dong
cbaa821b7f Remove dependency of libvideoeditor_jni.so on static libs from video editor engine 
related-to-bug: 6328360

Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
 2012-05-15 00:31:45 -07:00
James Dong
6e3bceef9c VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted. 
o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o related-to-bug: 6214141

Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
 2012-03-24 09:42:59 -07:00
James Dong
798cda73e1 Change Android.mk file to use the new location after /frameworks/media/libvideoeditor source files are moved 
o related-to-bug: 6214141

Change-Id: Ic9f07a8558e944237ccaba4f756fcab59f84e78f
 2012-03-22 19:11:43 -07:00
James Dong
e1dea48f92 Switched to use the header files in /frameworks/native 
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
 2012-03-12 21:28:57 -07:00
James Dong
1b5fa0f811 Removed the include header path since it is not needed. 
o related-to-bug: 6044894

Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
 2012-03-12 14:46:41 -07:00
Mathias Agopian
8335f1cccc fix libgui header location 
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
 2012-02-27 13:03:08 -08:00
James Dong
459f40dfb3 move away from MediaDebug and use ADebug instead for video editor engine 
Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
 2012-02-09 23:52:19 -08:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Steve Block
6215d3ff4b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
 2012-01-04 20:05:49 +00:00
Glenn Kasten
490909d2c0 Extract out audio DSP code to utility library 
Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
 2011-12-16 11:42:03 -08:00
Hong Teng
29f1c32eea am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, 
* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
  Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
 2011-12-02 13:44:10 -08:00
Hong Teng
63149c81ad Fixd for 5490443 Native crash while exporting a video 
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.

Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
 2011-12-01 09:43:42 -08:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
 2011-10-26 09:57:54 +01:00
Chih-Chung Chang
a18886ca08 Fix 5278371: OOM in MediaItemThumbnailTest 
Because we request 400x240 thumbnails. 100 thumbnails needs 38M,
which is too much. Change it to 70 now.

Also handle the case if the thumbnail callback throws exception.

Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
 2011-09-09 13:58:59 +08:00
Chih-Chung Chang
47a52158d2 Fix 5156702: rotate thumbnails 
Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
 2011-09-07 19:20:45 +08:00
Rajneesh Chowdury
c847b1a89d Fix for 5156702 Rotate video output for thumbnails and export 
This is part of a multi project submit.
This is the Java and Jni changes.

Change-Id: I8851f5d865e657b7846bcded38e752f388f95895
 2011-08-30 12:44:44 -07:00
Rajneesh Chowdury
3ced044154 Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java) 
Also fixes 5118207 add other video codec support for video editor export.

Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
 2011-08-19 14:34:47 -07:00
Chih-Chung Chang
7f639d3315 Merge "Fix 5144356: Native crash while importing music" 2011-08-18 18:39:01 -07:00
Rajneesh Chowdury
a91495d56d Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%" 2011-08-18 09:09:35 -07:00
Chih-Chung Chang
176dde85a0 Fix 5144356: Native crash while importing music 
1. Use the correct Get*Field functions according to the field type.
2. When we have exceptions, return.

Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
 2011-08-18 15:28:43 +08:00
Rajneesh Chowdury
6721d33fef Fix for 5155561 During export, progress bar jumps from 0 to 50% 
Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
 2011-08-17 16:12:39 -07:00
Chih-Chung Chang
1f5de3833d Display thumbnails one by one and cache them. 
Change-Id: I10808f5bca475aea924817bf532dc5916438563a
 2011-08-16 16:48:43 +08:00
Chih-Chung Chang
cb04a1f3a3 Speed up thumbnail generation. 
We don't need to have precise position for thumbnails, so we add
a tolerance parameter to the decoder. The decoder can return an
earlier frame within the tolerance time given.

Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
 2011-08-15 10:08:33 +08:00
Chih-Chung Chang
17cfcbfa29 Add dependencies for the YV12 color converter change. 
Bug: 5061733
Change-Id: Id8227a4f634285323c37498604fe080d986bfb09
 2011-07-27 09:18:26 +08:00
Chih-Chung Chang
b33d46cc77 Merge "Add filename and line number in the debug messages." 2011-07-25 18:36:57 -07:00
Chih-Chung Chang
25ba294d1f Add filename and line number in the debug messages. 
Change-Id: I0e19215cd6f26ccd97bcbff765194adda5faf940
 2011-07-22 05:08:39 +08:00
Hong Teng
600acf14ff fix for issue 4142219 
Don't hard code platform-specific limitations-jni/java part

Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
 2011-07-20 16:51:39 -07:00
Chih-Chung Chang
ff90212a3c Remove curtain effect (it's unused). 
Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
 2011-06-30 14:41:20 +08:00
Shailendra
d7ed599263 Fix for kenBurn Effect for PNG image is crashing (4861071 ) 
Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
 2011-06-22 12:15:56 -07:00
hongteng
2fb605a088 Fix for issue 3385135 "source code cleanup" engine part 
- remove the unused header files

Change-Id: I78971f7a6ae9325ce96a474e448c6f3d586d7ba6
 2011-04-22 11:46:10 -07:00
Shyam Pallapothu
c0125dd4f1 Fix for issue 4133431 "Remove OSAL layer" in JNI part 
Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
 2011-04-21 19:13:56 -07:00
Shyam Pallapothu
3feb41ff6f Fix for issue 4133431 "Remove OSAL layer" in JNI 
Change-Id: I55f43989a8b89a3811468b30646fe1af0c87b386
 2011-04-20 20:28:32 -07:00
Dheeraj Sharma
7743fa64b1 Fix for issue 4133431 "Remove OSAL layer" in JNI part" 
Fix for issue 4133431

Change-Id: I5879b740e7104abca7f4e1e831629997a6eec781
 2011-04-20 18:33:02 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui 
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
 2011-03-25 18:42:40 -07:00
Rajneesh Chowdury
0b8fe2012d am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
 2011-03-16 16:10:32 -07:00
Rajneesh Chowdury
8e7991a52e Fix for 4087846 Crash reported by monkey report (Java/Jni) 
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
 2011-03-15 16:20:17 -07:00
Iliyan Malchev
3070af0882 frameworks/base: remove LOCAL_PRELINK_MODULE 
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-03-14 14:25:59 -07:00
Ying Wang
eab30df281 Remove unnecessary ld flags. 
This fixes the x86 buid, in which bfd linker is unavailabe.

Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
 2011-03-11 16:06:02 -08:00
Santosh Madhava
895a28e14e Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents 
Change-Id: I376483c42b5bed8d2a1765804c2261c18d720a0c
 2011-03-04 18:37:51 -08:00
Basavapatna Dattaguru
4fad6762c6 Fix for issue 3371667: fix source code compilation warnings (4) 
Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
 2011-03-02 10:37:58 -08:00
Santosh Madhava
71771b3b1b Fix for issue 3431967: Memory leak from video editor engine 
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
 2011-03-01 11:44:50 -08:00
Santosh Madhava
7c8f25f5b8 Fix for issue 3431967: Memory leak from video editor engine 
Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
 2011-02-27 20:27:20 -08:00
Santosh Madhava
df4723ef3c Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames 
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
 2011-02-16 22:32:02 -08:00
Basavapatna Dattaguru
9cfeb6ecfa VideoEditor:Issue ID: 3431967 
Fixes memory leak in getProperties
Updated with Review comments

Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
 2011-02-16 14:29:02 -08:00