summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.Rajneesh Chowdury2011-10-192-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Audio Object type 5(SBR) and 29(PS) in audio decoder node. Change-Id: I9b631893f530d0c8550a0a7addfbdce226313693
* | | | | | | | | | | | | | | am 52da22e1: Fix for 5234840 Corrupted frames in transitionHong Teng2011-10-191-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | / / / / / / / / / / / / | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | * commit '52da22e185f4bd4c7778706d8651a2706cdffc5b': Fix for 5234840 Corrupted frames in transition
| * | | | | | | | | | | | | Fix for 5234840 Corrupted frames in transitionHong Teng2011-10-191-3/+6
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to solve the corrupt frame in transition clip generated from mpeg4 input clip. Compress domain trimming is disabled for mpeg4 since hardware encdoer may use different time scale value than the input mpeg4 clip. Change-Id: I19377a19840f599ba9cb24c89dc86aaa63fc229e
* | | | | | | | | | | | | am 71184927: Fix for 5154138 Titles are not aligned properly in a exported ↵Hong Teng2011-10-183-336/+428
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movie from Movie Studio Apply frame effect(overlay) after rendering mode was done * commit '711849272b603a88f751c1758b51a1dfbec315df': Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
| * | | | | | | | | | | Fix for 5154138 Titles are not aligned properly in a exported movie from ↵Hong Teng2011-10-183-336/+428
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Movie Studio Apply frame effect(overlay) after rendering mode was done Change-Id: I1ff9cc868117cc8dcdc735e6854ff429b74e8154
* | | | | | | | | | | Remove RTSP support from libvideoeditor's PreviewPlayer...Andreas Huber2011-10-123-77/+4
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2032772037c1130736081cb62bd6ce8d1270e1b9
* | | | | | | | | | Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack ↵Hong Teng2011-10-052-3/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | functional test."
| * | | | | | | | | Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.Hong Teng2011-10-052-3/+20
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e
* | | | | | | | | Video editor incorrectly rejects videos that could be supported by the HW ↵James Dong2011-10-031-13/+27
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder Change-Id: I831b32c7ab02fa110865c88bbb02f339889d97a5 related-to-bug: 5407761
* | | | | | | | Merge "Fix for 5205420 compression domain trimming fallback mechanism"Rajneesh Chowdury2011-09-262-20/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix for 5205420 compression domain trimming fallback mechanismRajneesh Chowdury2011-09-232-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transcode if clip's profile or level exceeds encoder's supported profile or level. Change-Id: Ib2f678828a58657b095ef6ef219fd0aa2bdccf91
* | | | | | | | am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level ↵Rajneesh Chowdury2011-09-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings are not always correctly set * commit '996fb989eb4cbe80c91cfe3ef4d32f349dffa72d': DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
| * | | | | | | DO NOT MERGE. Fix for 5247764 profile and level settings are not always ↵Rajneesh Chowdury2011-09-233-12/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly set Cherry picked from master. Correct video bitrate value is set from 3gpReader node. Also, bitrate is limited to max supported by encoder as per profile and level. This patch also fixes bug 5309520 [Prime] Native crash while running CTS test testExportEffectOverlay. Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e
* | | | | | | | Fix for 5274212 Transition clip contains more video frames from 1 video clip ↵Rajneesh Chowdury2011-09-221-4/+4
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than the other Set the alpha blending value correctly. Change-Id: I6aaed47144d09d182afb1c70d5bb72b7360fb51e
* | | | | | | am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play ↵Rajneesh Chowdury2011-09-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exported movie from Movie Studio * commit '2e200ef75541ee0f494877a42ae0e870799cc35c': DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
| * | | | | | DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie StudioRajneesh Chowdury2011-09-152-23/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure video encoder is not created and destroyed for every clip. Change-Id: I9ce4db9312af801570dd51f4b075f262e27e3952
* | | | | | Merge "Fix for 5247764 profile and level settings are not always correctly set"Rajneesh Chowdury2011-09-153-12/+316
|\ \ \ \ \ \
| * | | | | | Fix for 5247764 profile and level settings are not always correctly setRajneesh Chowdury2011-09-143-12/+316
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct video bitrate value is set from 3gpReader node. Also, bitrate is limited to max supported by encoder as per profile and level. This patch also fixes bug 5309520 [Prime] Native crash while running CTS test testExportEffectOverlay. Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e
* | | | | | Fix for bug 5255159 Cannot play exported movie from Movie StudioRajneesh Chowdury2011-09-142-23/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Ensure video encoder is not created and destroyed for every clip. Change-Id: I7a1d525e7bcdc839acc39d43e5046207c2d3b44f
* | | | | Fix forHong Teng2011-09-122-23/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -5234840 corrupted frames in transition. -Green frames in image transition. modified: vss/mcs/src/M4MCS_API.c modified: vss/src/M4VSS3GPP_EditVideo.c Change-Id: I2632d47c44f00bbc81e2b3e19b225178ab456810
* | | | Enable some logs to debug 5195693.Chih-Chung Chang2011-09-051-5/+6
| | | | | | | | | | | | | | | | Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d
* | | | Fix 5240036: We didn't handle the 1920x1080 resolution.Chih-Chung Chang2011-09-021-0/+6
|/ / / | | | | | | | | | Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc
* | | Fix for 5156702 Rotate video output for thumbnails and exportRajneesh Chowdury2011-08-3012-31/+663
|/ / | | | | | | | | | | | | This is part of a multi project submit. This is the native engine part. Change-Id: Icde922194a123a90544942caa12430fc3c4ef10e
* | Merge "Fix 5200858: we need to pass timestamp to render correct frames."Chih-Chung Chang2011-08-291-4/+5
|\ \ | |/ |/|
| * Fix 5200858: we need to pass timestamp to render correct frames.Chih-Chung Chang2011-08-291-4/+5
| | | | | | | | Change-Id: I262cefabea87f75883bcd074370deae054df3e88
* | Merge "Fix 5123908: Native crash rewinding movie"Chih-Chung Chang2011-08-283-261/+149
|\ \ | |/ |/|
| * Fix 5123908: Native crash rewinding movieChih-Chung Chang2011-08-233-261/+149
| | | | | | | | | | | | Simplify the VideoEditorSRC code and fix some bugs. Change-Id: I6bcf3a5cea21a2eec4b51f167560c4b0d3a04a29
* | Fix 5212886: free the reader after freeing decoders.Chih-Chung Chang2011-08-261-38/+41
| | | | | | | | | | | | | | If we free the reader first, the decoder may still read from it after the reader is freed. So we need to free the reader last. Change-Id: Ib6c7d6991d544870f1b3892387d0db312d501755
* | Fix 5200962: Handle 0-length buffers from OMXCodec and drop it.Chih-Chung Chang2011-08-261-0/+7
| | | | | | | | Change-Id: I67c42c41f649f8e37055721efb67ab3ca4b02f0b
* | Fix 5180429: Initialize native window transform to 0.Chih-Chung Chang2011-08-251-8/+10
| | | | | | | | Change-Id: I2730895059d408fa731dc4ca8da3f7984fe196ae
* | Fix for 5151331 [CRESPO] testPerformanceExport failedRajneesh Chowdury2011-08-231-0/+34
|/ | | | | | Ensure encoding width and height are multiple of 16. Change-Id: Ia077a52a16273cb9f775ebe0f0c66a81a35b9e19
* Fix for 4142219 Don't hard code platform-specific limitations.Rajneesh Chowdury2011-08-1927-1285/+636
| | | | | | | | | | Also fixes 5118207 add other video codec support for video editor export. For importing video clips, Video Editor engine will query StageFright codecs for supported codecs, profiles and levels. For Export, the profile and level are configured in media_profiles.xml Change-Id: I85c8bb8b87cfcf0f1351ecb8c4f369a8902e7a09
* Fix 5115581: Native crash while importing audio trackChih-Chung Chang2011-08-181-111/+56
| | | | | | | Add locking in storeBuffer and read. Use the Vector class to simplify the code. Change-Id: If36ddda432df2b6d6d728b27fa196d2a655e0ba4
* Speed up thumbnail generation.Chih-Chung Chang2011-08-156-212/+204
| | | | | | | We accept a tolerance parameter while decoding. We also tell the stagefright decoder to jump so we can move to the new frame faster. Change-Id: Iede3c1f909f1c42b2d5a53c782083367b00f62fb
* Add connect calls for SurfaceTexture. Clean PreviewRenderer.Chih-Chung Chang2011-08-114-135/+58
| | | | | | | Now connect() is necessary for SurfaceTexture. Also cleaned unused code in PreviewRenderer. Change-Id: Ic49df01e79f38a48a8c2cf194d13ee575660c834
* Merge "Fix for 4132872 inefficient export logic."Rajneesh Chowdury2011-08-0919-976/+2799
|\
| * Fix for 4132872 inefficient export logic.Rajneesh Chowdury2011-08-0819-976/+2799
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes 3371103 Transitions between images takes a long time to generate. Redundant transcoding is removed. Decode encode will be done only once per clip. For images, conversion to 3gp clip is removed (except for generating Kenburn image clip). Change-Id: Id722cd0296641bd643eb5c63f4d8028716259c01
* | Rename YV12 to I420.Chih-Chung Chang2011-08-089-76/+76
| | | | | | | | Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0
* | Use GL to render preview.Chih-Chung Chang2011-08-0813-343/+862
| | | | | | | | | | | | | | | | | | | | | | To speed up the preview, we direct the decoder output to a SurfaceTexture, then draw the texture to a surface. The media rendering parameters (crop, black-border) are implemented using different vertex coordinates. The color effects are implemented using fragment shaders. Currently only three color effects are implemented, but that's all the appplication uses. Change-Id: If84439fee572ed37ea077749ef9f2bd4f78703e1
* | Merge "Remove excessive logging"James Dong2011-08-041-2/+2
|\ \
| * | Remove excessive loggingJames Dong2011-08-021-2/+2
| |/ | | | | | | | | Change-Id: Ie0b37da59ad326184c983626c45ea78908e7c2b7 related-to-bug: 5109084
* | Remove unused mLastVideoBuffer and bAppliedVideoEffect.Chih-Chung Chang2011-08-032-30/+2
| | | | | | | | Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246
* | Remove PreviewLocalRenderer (simplify the code).Chih-Chung Chang2011-08-022-117/+9
|/ | | | Change-Id: I1f04e591cd0a33eb70bd93d5600aba12e727386e
* Fix for 5083973 M4VSS3GPP_editCleanUp called twice problem.Rajneesh Chowdury2011-07-281-0/+12
| | | | | | Set VSS context to NULL after cleanup. Change-Id: I1086fbe60a7777b00e80f0ea504f58a183fd3241
* Remove unnecessary encoder input format check.Chih-Chung Chang2011-07-271-29/+3
| | | | | | | | | This was preventing the export function from working because the encoder may accept a format other than YV12. As we always convert frames to what the encoder accepts, the check is unnecessary. Change-Id: I2056f560b4737d33956b277fb39ebe85278464ae
* Add YV12 color converter interface for VideoEditor.Chih-Chung Chang2011-07-2714-248/+414
| | | | | | | | | | | | The original assumption in VideoEditor is that the decoder output and encoder input are in YV12 format. However on different hardware platform the actual formats may be different. So now we load a platform-specific YV12 color conversion module which knows the actual format and can convert to/from YV12, which is the format used in VideoEditor internally for processing. Bug: 5061733 Change-Id: I852f85efd30c05cf6c42810059ee4d2ef37ee3da
* Clear buffer lists in stop() so we won't free the buffers again.Chih-Chung Chang2011-07-261-0/+3
| | | | | | Bug: 5073626 Change-Id: Ia41fc089568b48de005235d66c9b5b1a5f72b5ca
* Fix for issue 5055001 Movie studio is unusable after importing musicRajneesh Chowdury2011-07-221-84/+92
| | | | Change-Id: I9b3da1122e807c034cf44dd51b5e1d92dd84d73f
* Merge "Remove hard-coded requirement for number of buffers."Chih-Chung Chang2011-07-211-91/+238
|\
| * Remove hard-coded requirement for number of buffers.Chih-Chung Chang2011-07-201-91/+238
| | | | | | | | | | | | | | | | | | This change use two threads to read and return buffers from/to the encoder, so we won't block on read even if there are not enough input buffers. Bug: 4972572 Change-Id: Iab07da5b55ef384e1d2723b4f5d3164e5a509ebd