summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
Commit message (Collapse)AuthorAgeFilesLines
* Add gapless playback support for NuPlayerMarco Nelissen2012-04-022-4/+12
| | | | | | | | | This makes NuPlayer use a SkipCutBuffer when needed, and adds a new AudioSink method to retrieve the number of frames written so far, so NuPlayerRenderer can calculate how much data it can write without blocking. Also make some more methods const. Change-Id: Id7d253ad8a7b85e9a84ca2baafbe32817b16c744
* AV Android make files changesJames Dong2012-03-284-13/+10
| | | | | | | 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-243-6/+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-227-36/+36
| | | | | | o related-to-bug: 6214141 Change-Id: I3ef60ca7670df37d7e43546e244cfe6a33093ba9
* Add libmedia_nativeGlenn Kasten2012-03-201-0/+1
| | | | Change-Id: I4bff781a26d01023d23d5285a8aa83dbce46c629
* Fix LOCAL_C_INCLUDES and correct #include syntaxGlenn Kasten2012-03-146-11/+6
| | | | Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
* Prepare frameworks/native/services/audioflingerGlenn Kasten2012-03-142-0/+2
| | | | | | | | 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-124-4/+4
| | | | | | o related-to-bug: 6044887 Change-Id: I3a1143b09560a6b8fd67d23bbb375c83442a12e9
* Swtched to use header file in /frameworks/nativeJames Dong2012-03-123-128/+2
| | | | | | 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-112-1/+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
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-082-2/+2
|/ | | | Change-Id: I425cfd442257560dcf141d3d8599ddc7d21c1d13
* Set channel mask when opening audio sinkJean-Michel Trivi2012-03-053-7/+19
| | | | | | | | | Update the code to use the AudioSink::open() interface that takes a channel mask as an additional parameter. The code is only stereo, and returns an error when attempting to create a video editor audio sink with more than two channels. Change-Id: Ib9bba067da0b286c08656976b89fba7c8b42f99f
* fix location of libgui headersMathias Agopian2012-02-264-5/+3
| | | | Change-Id: I0d203f4e7aa83e0449f7ebb9f3cafe021e38fc2f
* remove dependency on android_native_buffer.hMathias Agopian2012-02-241-1/+1
| | | | Change-Id: I720d5e6ac7e4455d7ab59eab7e9c2478b911228a
* Update method sigs.John Grossman2012-02-103-4/+4
| | | | | | | 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-0914-16/+17
|\
| * Move away from MediaDebug and use ADebug insteadJames Dong2012-02-0814-16/+17
| | | | | | | | 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
* Removed unnecessary memset before an immediate memcpyJames Dong2012-02-061-2/+0
| | | | Change-Id: I447057f861bb6b7977de48a598fd5bed7e75460b
* 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
* Clean up VideoEditorPreviewController class part one:James Dong2012-01-302-74/+78
| | | | | | | | | o moved local types inside the class to avoid external exposure o use non-virtual destructor since it is not meant to be a base class o removed unused header files and moved some of the header files to .cpp file from .h file o replaced #define constants with local enums Change-Id: Ib321fc8c0379955083bc892c2ef93ed58c6c2ff5
* Merge "Fix an error to deal with 0-size nal units in some AVC files"James Dong2012-01-301-15/+8
|\
| * 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
* | Clean up VideoEditorGBAudioProcessingJames Dong2012-01-263-110/+99
|/ | | | | | | | | o added #ifndef/#define in the header o removed unused variables o renamed some types and methods o replaced macro with class private enum Change-Id: I588ef062fcadcd11591a5a55b4aed771c724492f
* Merge "AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect."James Dong2012-01-237-703/+294
|\
| * AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect.James Dong2012-01-207-703/+294
| | | | | | | | | | | | | | o this patch removed the AudioPlayerBase class. o verified and passed functional tests Change-Id: I33727069ef63136979b954a9dee1c35309ef6dd4
* | Fix an error that missed an "=" for equality in an if statementJames Dong2012-01-231-1/+1
|/ | | | Change-Id: Ib566226b427f5357d52c7b9c0742afa05fdd3a84
* Merge "More source code Clean up in video editor engine"James Dong2012-01-2016-2109/+1026
|\
| * More source code Clean up in video editor engineJames Dong2012-01-1916-2109/+1026
| | | | | | | | | | | | | | | | | | o fixed incorrect design and got rid of PreviewPlayerBase class o removed obsolete/unused code as much as possible and reformatted the source code o verified and passed functional tests o More to come ... Change-Id: I7a89162f8b9d9ea6eabcf0457366cd2f6d970d11
* | Don't allow evil constructors in VideoEditorBGAudioProcessingJames Dong2012-01-191-0/+5
|/ | | | Change-Id: Ic525ed66308681ec62363bc90ed2cea42c165a2b
* Fix two typos in the defined frequency enumsJames Dong2012-01-172-2/+2
| | | | Change-Id: Ia0b6af98bd8f2ccb4d79705064a225e5f699ed8d
* 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
generated by cgit v1.1 at 2024-05-26 02:33:58 +0000