38 Commits

Author SHA1 Message Date
Mathias Agopian
3866f0d581 split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
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
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
Mathias Agopian
8335f1cccc fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
2012-02-27 13:03:08 -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
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
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
Rajneesh Chowdury
8e7991a52e Fix for 4087846 Crash reported by monkey report (Java/Jni)
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
2011-03-15 16:20:17 -07: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
Santosh Madhava
9ee9aad809 Fix for issue 3444358 : Movie studio is broken in Master-TOT
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
2011-02-11 11:34:26 -08:00
Dheeraj Sharma
fb4e92c4ed Fix for issue : 3439708 Last frame is missing effect
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
2011-02-10 18:05:20 -08:00
Santosh Madhava
91ba3a0033 Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
2011-02-09 19:25:17 -08:00
Dharmaray Kundargi
beb9fc8ee8 Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
2011-02-02 03:25:01 -08:00
Dharmaray Kundargi
c08f85a648 Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
2011-02-01 20:19:16 -08:00
Dheeraj Sharma
5618e037af Fix for issue 3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
2011-01-29 21:29:49 -08:00
Dharmaray Kundargi
c16ccc1c5a Fix for Issue 3370836 : JNI files for Overlay optmization.
Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
2011-01-26 00:27:58 -08:00
Dheeraj Sharma
1ac760afab Issue no : 3370622
VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
2011-01-24 22:52:40 -08:00
Dheeraj Sharma
05d9f81bd6 VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
2011-01-19 11:42:53 -08:00
Dharmaray Kundargi
cd196d3727 videoeditor JNI files on honeycomb
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
2011-01-16 19:19:07 -08:00