| 3866f0d581ceaa165710feeee9f37fe1b0d7067d |
|
12-Feb-2013 |
Mathias Agopian <mathias@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 3a084af2e90849aaa8beb3a610189e3399c63ea0 |
|
07-Nov-2012 |
Kenny Root <kroot@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| c96a7294a4ec7f807dbe0fd82a2ba2d58008304b |
|
25-Jun-2012 |
wfeng6 <wei.feng@intel.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 54c40e033e487b96ff3356d29ab02cc1304f4117 |
|
30-May-2012 |
James Dong <jdong@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 8335f1ccccedb6655d96d9d5b697a7f0938235dd |
|
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 3762c311729fe9f3af085c14c5c1fb471d994c03 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 29f1c32eea12ab33547af73fb0e5dcf432e6979c |
|
02-Dec-2011 |
Hong Teng <hongteng@google.com> |
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.
|
| 63149c81adf79f43c6508647614247277f8052e2 |
|
01-Dec-2011 |
Hong Teng <hongteng@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 71f2cf116aab893e224056c38ab146bd1538dd3e |
|
20-Oct-2011 |
Steve Block <steveblock@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| a18886ca08b32c5c949a285f27c8713e05e3dd11 |
|
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3 |
|
07-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5156702: rotate thumbnails
Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| c847b1a89df94dbff4c2f557f8c042ead5398c3f |
|
30-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 3ced044154945f9d60983032278e00fe28f4ab1b |
|
13-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 7f639d33151be143f062274b0da0729c29391bdb |
|
19-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5144356: Native crash while importing music"
|
| a91495d56dc10a57ed21490ffafae742b6411d6e |
|
18-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"
|
| 176dde85a0ba838c1aed4148473743d964edbaec |
|
18-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 6721d33feff547e938aeba20073c9c0cc6a3390b |
|
17-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5155561 During export, progress bar jumps from 0 to 50%
Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 1f5de3833daddfa1d0ebc7dee1f9e007d4ed36a0 |
|
15-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Display thumbnails one by one and cache them.
Change-Id: I10808f5bca475aea924817bf532dc5916438563a
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| cb04a1f3a31c252a0e3fda5e7eaa16f3257c9397 |
|
09-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
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
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 2fb605a088d25037c66eae04f5d35ea1fe115390 |
|
22-Apr-2011 |
hongteng <hongteng@google.com> |
Fix for issue 3385135 "source code cleanup" engine part
- remove the unused header files
Change-Id: I78971f7a6ae9325ce96a474e448c6f3d586d7ba6
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| c0125dd4f1f8bb03ad16138f86d55ed3305240c4 |
|
22-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI part
Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 3feb41ff6f617768eb25c1b69c473d33f4f2f37b |
|
21-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI
Change-Id: I55f43989a8b89a3811468b30646fe1af0c87b386
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 7743fa64b11e9747d3ba8065a08a33ee9d90938f |
|
12-Apr-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI part"
Fix for issue 4133431
Change-Id: I5879b740e7104abca7f4e1e831629997a6eec781
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 8e7991a52edb3eb8bd1a44ceb7f6d97108748c8c |
|
16-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4087846 Crash reported by monkey report (Java/Jni)
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 71771b3b1bbcafe84e7bd14941b98a1b1d6c8a60 |
|
01-Mar-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967: Memory leak from video editor engine
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 7c8f25f5b81ed2c6520174ead6d0fdf96a313945 |
|
28-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967: Memory leak from video editor engine
Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| df4723ef3c43b3a0b2548908a4461db29b5649d2 |
|
17-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 9ee9aad80981c661af3f4c16f5932aef1f98e7b0 |
|
11-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3444358 : Movie studio is broken in Master-TOT
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| fb4e92c4ed316295c7cde38e58cf0816c0e5f8ce |
|
11-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue : 3439708 Last frame is missing effect
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 91ba3a0033f1ed7f26fc9e8cd9088479c7de134a |
|
10-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| beb9fc8ee8d3bd14d141104e91d41809dcfe0e1a |
|
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| c08f85a6484ee5da7062a5eac0f19912bd7e2513 |
|
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 5618e037af1a9d4323990a580d4181b9bc8e3091 |
|
30-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| c16ccc1c5a6293136ae9bd4756dc2f57914a2020 |
|
22-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix for Issue 3370836 : JNI files for Overlay optmization.
Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 1ac760afabeb19ced48a788c7b675baba47d4db3 |
|
24-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Issue no : 3370622
VideoEditor: Fix for Clear Surface API
Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 05d9f81bd638a749669192b50e680b166529d5f3 |
|
24-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| 581cad2221cb367e9e3ef6991c565cd37ced994f |
|
19-Jan-2011 |
James Dong <jdong@google.com> |
Turn error/exception logging on at the native layer
o also fixed some compilation warnings
Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|
| cd196d3727db641e581d4223815367a5ca5d5637 |
|
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
videoeditor JNI files on honeycomb
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
/frameworks/base/media/jni/mediaeditor/VideoEditorMain.cpp
|