summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording ↵ztenghui2013-04-151-2/+2
|\ | | | | | | mode." into jb-mr2-dev
| * MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.ztenghui2013-04-151-2/+2
| | | | | | | | | | | | | | | | By default, MPEG4Write will keep running in real time recording mode. bug:8598944 Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf
* | Add liblogYing Wang2013-04-091-1/+1
|/ | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Prevent invalid frame durationsOla Andersson2013-03-121-0/+6
| | | | | | | Prevent frame duration from being negative when exporting movie studio project Change-Id: I459fb243650c777c2b59d1094acc88c3a944bd81
* Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"James Dong2012-12-212-2/+2
|\
| * libvideoeditor: fix code bugs when enabling all-level debugging macrosbeanz2012-11-072-2/+2
| | | | | | | | | | Change-Id: Ic8aedfa821d79698d31cf7ee3bf382aae85981f6 Signed-off-by: beanz <beanz@marvell.com>
* | libvideoeditor: fix cannot show some thumbnails in storyboard or no frame ↵beanz2012-11-161-0/+6
| | | | | | | | | | | | | | | | | | | | display in PreviewRenderer surface after importing video 1. this is caused mFrameIntervalMs isn't assigned for use-software-codec case 2. without the assingment, some decoded frames will not be copied to the buffer queue of VideoEditorVideoDecoder Change-Id: I578954e38958ebac8f258300e60b8ddf60e50521 Signed-off-by: beanz <beanz@marvell.com>
* | Integrate improved coefficient sinc resampler: VHQGlenn Kasten2012-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: Very high quality is enabled only for 44.1 -> 48 or 48 -> 44.1, and uses low quality for all other use cases. Track estimated CPU load and throttles the quality based on load; as currently configured it should allow up to 2 instances of very high quality. Medium quality and high quality are currently disabled unless explicitly requested. Details: Only load .so the first time it is needed. Cleanup code style: formatting, indentation, whitespace. Restore medium quality resampler, but it is not used (see next line). Fix memory leak for sinc resampler. Check sample rate in resampler constructor. Add logs for debugging. Rename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels. Renumber VERY_HIGH_QUALITY from 255 to 4. Use enum src_quality consistently. Improve parsing of property af.resampler.quality. Fix reentrancy bug - allow an instance of high quality and an instance of very high quality to both be active concurrently. Bug: 7229644 Change-Id: I0ce6b913b05038889f50462a38830b61a602a9f7
* | am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."Jean-Baptiste Queru2012-08-081-0/+6
|\ \ | |/ | | | | | | * commit '4348cbcec6c3aec02af722d633ebda24f94dfcc8': Initialize pool's buffer pointers to null.
| * Initialize pool's buffer pointers to null.Truls Bengtsson2012-07-111-0/+6
| | | | | | | | | | | | | | | | If these pointers are not properly initialized to null and allocation of one of the buffers subsequently fail, the freePool mechanism might erroneously free uninitialized pointers. Change-Id: I2101bdb2cc576e5f50b5a1440e6fc0c54dc4e81b
* | Fixed a video editor crash due to "divided by 0"James Dong2012-06-291-4/+8
|/ | | | | | | | The crash was because the video sample was too short and has 0 duration (or a single frame video). This patch is just simply not to support 0 duration video for editing. Change-Id: I2c7ff78b1e884a4d3a5051f87cdbeeb5dc3078a6 related-to-bug: 6670656
* Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditorJames Dong2012-06-1210-0/+950
| | | | | Change-Id: I19308c5fb0f39f8e696092186f4386e3dad06894 related-to-bug: 6647465
* Fix green or corrupted video frames in the exported moviesJames Dong2012-06-074-36/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | At least two use cases are affected: trimming and transition clip generation. If the starting time of the transition or the trimming position is not the same as that of any existing video frame, the video frame right before the transition starting position or the trimming position must be encoded as the the first video frame for the transtion or the trimmed video, and it is encoded as a key frame. This frame was not saved without the patch. In the transcoding phrase, since we could not find such a frame, the existing code did not return an error, and incorrectly used some other frame to serve as the reference key frame for the remaining video frames of the transition or the trimmed video. As a result, we may see corrupted or green video frames in the exported movies. The fix is to always save the frame right before the trimming position or the transition starting time, so that a key frame will always be encoded, and the right reference frame is used for remaining video frames. In addition, checks are added to prevent from future mistakes to use incorrect reference frames. Patch was originally contributed by teng.hong@nxp.com Change-Id: I182784d4c1786224445224634edab3338bf2278f related-to-bug: 5713461
* Fix another buffer overflow issueJames Dong2012-05-311-60/+72
| | | | | | | | | | | Using hard-coded length value easily leads to buffer overflow. Refactor the code a bit to make it more readable, and more extensible, and less subject to the buffer overflow coding error. Patch originally contributed by teng.hong@nxp.com Change-Id: Id262915302ccea8ae3b0121bf39890ab463aeeb7 related-to-bug: 6328360
* Avoid prematurely terminating parsing when some track only has a single ↵James Dong2012-05-301-0/+22
| | | | | | | | | access unit Patch was contributed by teng.hong@nxp.com Change-Id: I0f56361d839f18627e512d18e86f51b58b9b0e05 related-to-bug: 6240789
* Remove libvideoeditor_jni.so's dependency on static libs in video editor engineJames Dong2012-05-165-31/+40
| | | | | | related-to-bug: 6502980 Change-Id: I9cbbf44eb53c406263df4003cc3de2af4d239180
* Revert "Remove libvideoeditor_jni.so's dependency on static libs in video ↵James Dong2012-05-152-22/+11
| | | | | | editor engine" This reverts commit 1af1f6a60b9fa217b6809e767babf1ce8a2e95c9.
* Remove libvideoeditor_jni.so's dependency on static libs in video editor engineJames Dong2012-05-152-11/+22
| | | | | | related-to-bug: 6328360 Change-Id: I36324820c7e72fedd8c4caf1b03443a4f7cec37f
* AV Android make files changesJames Dong2012-03-282-7/+5
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Resolve undesirable dependency of /frameworks/av/libvideoeditor on ↵James Dong2012-03-242-3/+77
| | | | | | | | | | | /frameworks/base/media/jni o move VideoEditorMain.h to /frameworks/av/libvideoeditor o removed JNI related C_INCLUDE in some Android.mk files o related-to-bug: 6214141 Change-Id: Iadd01eef701deb728fbac1a3f524ea1db72f6b48
* Make file change because libvideoeditor source files movedJames Dong2012-03-225-25/+25
| | | | | | o related-to-bug: 6214141 Change-Id: I3ef60ca7670df37d7e43546e244cfe6a33093ba9
* Fix LOCAL_C_INCLUDES and correct #include syntaxGlenn Kasten2012-03-142-3/+0
| | | | Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
* Prepare frameworks/native/services/audioflingerGlenn Kasten2012-03-141-0/+1
| | | | | | | | Part of this change will be reverted after the move is complete. p.s. this dependency on AudioFlinger should be removed Change-Id: Ib29d413b74a6dc1babe7a33471128be11304ce56
* Switched to use header files in /frameworks/nativeJames Dong2012-03-123-3/+3
| | | | | | o related-to-bug: 6044887 Change-Id: I3a1143b09560a6b8fd67d23bbb375c83442a12e9
* Swtched to use header file in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | o related-to-bug: 6044894 Change-Id: I192f0436572d240fd2fb88446f6fa63ba0128d7e
* Merge "Refactored MediaBufferPuller class from VideoEditorVideoEncoder class"James Dong2012-03-124-190/+274
|\
| * Refactored MediaBufferPuller class from VideoEditorVideoEncoder classJames Dong2012-03-064-190/+274
| | | | | | | | | | | | | | | | o MediaBufferPull class will be useful for the audio encoder also once we switch to use OMX-based audio encoder. o This is the part one for fixing bug 5947347 Change-Id: Icddfeb636f7a59ad766220ef0d3155abace73ad3
* | Update build dependency on AudioMixer headerJean-Michel Trivi2012-03-111-0/+1
|/ | | | | | | | | VideoEditorSRC doesn't need to include AudioMixer.h. VideoEditorResampler includes AudioMixer.h, which requires system/media/audio_effects/include in the include path. Change-Id: Ibf6194831aeb91e788ce0a3b1282a0d930ee6e48
* Update method sigs.John Grossman2012-02-101-2/+2
| | | | | | | Update the getNextBuffer signatures to have an additional (but ignorable) parameter used to implement timed audio output. Change-Id: Icb98e4af4d136c234ae8c5cbb4a5de4350b436bb
* Merge "Move away from MediaDebug and use ADebug instead"James Dong2012-02-098-10/+11
|\
| * Move away from MediaDebug and use ADebug insteadJames Dong2012-02-088-10/+11
| | | | | | | | Change-Id: I307b3f565808ec8e3b9a4d944c6c0d1f603b04c9
* | Fix green frame issueJames Dong2012-02-091-2/+2
|/ | | | | | | | | | When the transition clip is generated: two clips in general are involved. The second clip was assigned the incorrect effect number when a transition was coupled with a color effect o patch contributed by Hong Teng <hongteng@nxp.com> o related-to-bug: 5713461 Change-Id: I61b497620264692b331da8b8e7753240edc5d1aa
* Use AACEncoder instead of OMX-based AAC software encoder to workaround ↵James Dong2012-02-031-2/+9
| | | | | | | | issues in the video editor engine o related-to-bug: 5947347 Change-Id: I8eae8166e87e5809e2f3699f760f3a3e57895b4f
* Fix an error to deal with 0-size nal units in some AVC filesJames Dong2012-01-271-15/+8
| | | | | | o related-to-bug: 5890998 Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
* Fix an error that missed an "=" for equality in an if statementJames Dong2012-01-231-1/+1
| | | | Change-Id: Ib566226b427f5357d52c7b9c0742afa05fdd3a84
* Fix two typos in the defined frequency enumsJames Dong2012-01-171-1/+1
| | | | Change-Id: Ia0b6af98bd8f2ccb4d79705064a225e5f699ed8d
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-084-28/+28
| | | | | | | 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-052-3/+3
| | | | | | | 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-043-6/+6
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I261ad4d5348f4832488707edeb3cbdbb6dd12fca
* ditherAndClamp from libaudioutils not AudioMixerGlenn Kasten2011-12-162-2/+4
| | | | 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
* | 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-2510-456/+456
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
* 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
* | 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