summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-171-2/+2
|\
| * Use audio_stream_type_t consistentlyGlenn Kasten2012-01-121-2/+2
| | | | | | | | Change-Id: I0b3ba8ab74f03433d1e64cb898fa62c02535a2f1
* | Remove streaming related logic from preview player.James Dong2012-01-126-307/+32
|/ | | | | | | Video editor engine only deals with local file playback/preview. Change-Id: I8e3414abf8a109a77a1e34a959fb4a090612ae3d related-to-bug: 5857057
* Use audio_format_t consistentlyGlenn Kasten2012-01-122-2/+2
| | | | Change-Id: Idb08c49fe1a2c87ea2bb080815a5a6f95409834c
* Remove unnecessary drm handling logic in PreviewPlayerBase classJames Dong2012-01-112-185/+9
| | | | | Change-Id: I08b1e23ecf5775deb92a262fb9ed60a464fe60c0 related-to-bug: 5857208
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0813-85/+85
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I5c54a0185527f6ca3e746d625a007aa06f6f25f9
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-055-8/+8
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I605079da4a7c01e6555e2aab6f16ccf8cc6ac694
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-048-24/+24
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I261ad4d5348f4832488707edeb3cbdbb6dd12fca
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-033-11/+11
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I17166d9fb435c85c5fd9d5fba1a39d2661c61e10
* ditherAndClamp from libaudioutils not AudioMixerGlenn Kasten2011-12-164-3/+8
| | | | Change-Id: I1e8a00c81efefd956fe9e4d9b58557373320e322
* am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video ↵Hong Teng2011-12-021-0/+5
|\ | | | | | | | | | | | | Handle the decoder error case, this modification is to fix the native crash. * commit '38ca8aaf3ad045d8623bce0be9b351ae9004abb3': Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
| * Fix for issue 5490443 Native crash while exporting a videoHong Teng2011-11-301-0/+5
| | | | | | | | | | | | Handle the decoder error case, this modification is to fix the native crash. Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207
* | am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs ↵Hong Teng2011-11-221-0/+5
|\ \ | |/ | | | | | | | | | | to 30 secs * commit '8e61113210e4c3c1ce57ecef1dda327bea85c19c': Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
| * Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secsHong Teng2011-11-211-0/+5
| | | | | | | | | | | | -Remove the additional transcoding for kenburn video in video editor saving phase. Change-Id: Ia8721ba75d4b7923db0f483bf30209c6fa40e4bd
* | resolved conflicts for merge of fbb122bf to masterChih-Chung Chang2011-11-162-1/+11
|\ \ | |/ | | | | Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963
| * Merge "Fix 5607624: Native crash in movie studio while previewing the movie" ↵Chih-Chung Chang2011-11-152-1/+11
| |\ | | | | | | | | | into ics-mr1
| | * Fix 5607624: Native crash in movie studio while previewing the movieChih-Chung Chang2011-11-152-1/+11
| | | | | | | | | | | | Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29
* | | am 811c53c5: Fix for issue 5309336 -add videoeditor maximum ↵Hong Teng2011-11-153-8/+47
|\ \ \ | |/ / | | | | | | | | | | | | | | | prefetch YUV frames in media_profiles.xml to limit the total memory usage. * commit '811c53c58a870397f2864003dc21d5799a422b26': Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
| * | Fix for issue 5309336Hong Teng2011-11-143-8/+47
| |/ | | | | | | | | | | | | -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I43c03fc626194d9ebbe8d914d9209a04bc085831
* | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-2521-688/+688
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
* am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import ↵James Dong2011-10-202-0/+18
|\ | | | | | | | | | | | | the attached h263 file." into ics-mr0 * commit 'f23f725773de1eb394655e657cd12f95f6250b3d': Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
| * Merge "Fix for 5477832 Movie Studio crash when trying to import the attached ↵James Dong2011-10-202-0/+18
| |\ | | | | | | | | | h263 file." into ics-mr0
| | * 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
* 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
* 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
* 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