Cross Reference: /frameworks/av/libvideoeditor/

History log of /frameworks/av/libvideoeditor/
Revision	Date	Author	Comments (<<< Hide modified files) (Show modified files >>>)
ac6020508acedd316391dee42329040bf45f8d90	01-Oct-2012	Glenn Kasten <gkasten@google.com>	Integrate improved coefficient sinc resampler: VHQ 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 vpp/VideoEditorSRC.cpp ss/src/VideoEditorResampler.cpp
2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0	29-Aug-2012	Glenn Kasten <gkasten@google.com>	Move libnbaio out of AudioFlinger libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b vpp/VideoEditorSRC.h
76d46c5a3637d6ac9e664c449839befbbd09c0a0	08-Aug-2012	Jean-Baptiste Queru <jbq@google.com>	am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null." * commit '4348cbcec6c3aec02af722d633ebda24f94dfcc8': Initialize pool's buffer pointers to null.
28b76b334f92a15a2be3cc9e2f7d229a3275d1ac	04-Jul-2012	Glenn Kasten <gkasten@google.com>	Use audio_channel_mask_t for channel mask Change-Id: I1c1896da48983aa9f1462a4b471f910498816f60 vpp/VideoEditorAudioPlayer.cpp
9d8e55cd2705a6ab43ea4aca6f94feb7bef87938	11-Jul-2012	Truls Bengtsson <truls.bengtsson@sonymobile.com>	Initialize pool's buffer pointers to null. 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 ss/stagefrightshells/src/VideoEditorBuffer.c
53f69c194d7ae8105b4c6d0c9901eb96281c7bf9	30-Jun-2012	James Dong <jdong@google.com>	Fixed a video editor crash due to "divided by 0" 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 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b	14-Jun-2012	Jamie Gennis <jgennis@google.com>	Update ANativeWindow client code for sync This change updates all the uses of ANativeWindow to use the new ANW functions that accept and return Sync HAL fence file descriptors. Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16 vpp/Android.mk vpp/NativeWindowRenderer.cpp vpp/PreviewRenderer.cpp
4832fedbfe2c18c469ab198d9ac3c349cb797527	12-Jun-2012	James Dong <jdong@google.com>	Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor Change-Id: I19308c5fb0f39f8e696092186f4386e3dad06894 related-to-bug: 6647465 vpp/MODULE_LICENSE_APACHE2 vpp/NOTICE sal/src/MODULE_LICENSE_APACHE2 sal/src/NOTICE ss/3gpwriter/src/MODULE_LICENSE_APACHE2 ss/3gpwriter/src/NOTICE ss/mcs/src/MODULE_LICENSE_APACHE2 ss/mcs/src/NOTICE ss/src/MODULE_LICENSE_APACHE2 ss/src/NOTICE ss/stagefrightshells/src/MODULE_LICENSE_APACHE2 ss/stagefrightshells/src/NOTICE ss/video_filters/src/MODULE_LICENSE_APACHE2 ss/video_filters/src/NOTICE
3e1e78ccd5936111f31a709592f11aa7c677c42d	05-Jun-2012	James Dong <jdong@google.com>	Fix green or corrupted video frames in the exported movies 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 ss/inc/M4VSS3GPP_ErrorCodes.h ss/src/M4VSS3GPP_EditVideo.c ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
cafc53c0ac77c2aa7564cea26120da6bc0c589f2	31-May-2012	James Dong <jdong@google.com>	Fix another buffer overflow issue 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 ss/src/M4VSS3GPP_Clip.c
83410a85993ad6f5f0c122036ff0bda42bf1d4f7	31-May-2012	James Dong <jdong@google.com>	Avoid prematurely terminating parsing when some track only has a single access unit Patch was contributed by teng.hong@nxp.com Change-Id: I0f56361d839f18627e512d18e86f51b58b9b0e05 related-to-bug: 6240789 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
a86c809bff463ae1d782dcaa1c45d1acea5f34d3	15-May-2012	James Dong <jdong@google.com>	Remove libvideoeditor_jni.so's dependency on static libs in video editor engine related-to-bug: 6502980 Change-Id: I9cbbf44eb53c406263df4003cc3de2af4d239180 vpp/Android.mk sal/src/Android.mk ss/3gpwriter/src/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/stagefrightshells/src/Android.mk ss/video_filters/src/Android.mk
18793d77792e12f5f63e67f721bc238b6dc497a1	15-May-2012	James Dong <jdong@google.com>	Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine" This reverts commit 1af1f6a60b9fa217b6809e767babf1ce8a2e95c9. vpp/Android.mk sal/src/Android.mk ss/src/Android.mk ss/video_filters/src/Android.mk
1af1f6a60b9fa217b6809e767babf1ce8a2e95c9	15-May-2012	James Dong <jdong@google.com>	Remove libvideoeditor_jni.so's dependency on static libs in video editor engine related-to-bug: 6328360 Change-Id: I36324820c7e72fedd8c4caf1b03443a4f7cec37f vpp/Android.mk sal/src/Android.mk ss/src/Android.mk ss/video_filters/src/Android.mk
6f9add864e3513917fd35302b766e26aa40e6818	23-Apr-2012	Mathias Agopian <mathias@google.com>	remove dependency on SurfaceTexture::connect() Change-Id: I97ce29ecfde4df171120a3570db9575b32c8d362 vpp/NativeWindowRenderer.cpp
1948eb3ea6eee336e8cdab9b0c693f93f5f19993	14-Apr-2012	Eric Laurent <elaurent@google.com>	Add support for deep audio buffers Allow AudioSink to use deep audio buffering when the source is audio only and its duration is more than a certain threshold. This helps improve battery life but implies higher audio latency. Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
0ca3cf94c0dfc173ad7886ae162c4b67067539f6	18-Apr-2012	Eric Laurent <elaurent@google.com>	rename audio policy output flags Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp
4110c101c3d0dd8dbc44c8d2d0edd3e2e7d6652f	29-Mar-2012	Marco Nelissen <marcone@google.com>	Add gapless playback support for NuPlayer 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 vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
559bf2836f5da25b75bfb229fec0d20d540ee426	28-Mar-2012	James Dong <jdong@google.com>	AV Android make files changes 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 vpp/Android.mk vpp/PreviewRenderer.h ss/src/Android.mk ss/stagefrightshells/src/Android.mk
51f8eec23a2bcc2cc190373cdd1195972d9b8804	24-Mar-2012	James Dong <jdong@google.com>	Resolve undesirable dependency of /frameworks/av/libvideoeditor on /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 vpp/Android.mk ss/stagefrightshells/inc/VideoEditorMain.h ss/stagefrightshells/src/Android.mk
ecb3110adc6db7334ca4be6d5b3c130f38f5fa51	23-Mar-2012	James Dong <jdong@google.com>	Make file change because libvideoeditor source files moved o related-to-bug: 6214141 Change-Id: I3ef60ca7670df37d7e43546e244cfe6a33093ba9 vpp/Android.mk sal/src/Android.mk ss/3gpwriter/src/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/stagefrightshells/src/Android.mk ss/video_filters/src/Android.mk
16252eb65e873420d47bd2e0fb6a2a7877342224	13-Mar-2012	Glenn Kasten <gkasten@google.com>	Add libmedia_native Change-Id: I4bff781a26d01023d23d5285a8aa83dbce46c629 vpp/Android.mk
c1e3ed15d86337361c11fc4bb425ae252eceb946	13-Mar-2012	Glenn Kasten <gkasten@google.com>	Fix LOCAL_C_INCLUDES and correct #include syntax Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc vpp/Android.mk vpp/NativeWindowRenderer.cpp vpp/NativeWindowRenderer.h vpp/VideoEditorPlayer.h ss/src/Android.mk ss/stagefrightshells/src/Android.mk
39485a9071b06ab8bb390844ae39f783d6c0ed25	13-Mar-2012	Glenn Kasten <gkasten@google.com>	Prepare frameworks/native/services/audioflinger Part of this change will be reverted after the move is complete. p.s. this dependency on AudioFlinger should be removed Change-Id: Ib29d413b74a6dc1babe7a33471128be11304ce56 vpp/Android.mk ss/src/Android.mk
b240013c30a8be4dffc678a350c80205b5f4696d	12-Mar-2012	James Dong <jdong@google.com>	Switched to use header files in /frameworks/native o related-to-bug: 6044887 Change-Id: I3a1143b09560a6b8fd67d23bbb375c83442a12e9 vpp/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/stagefrightshells/src/Android.mk
022484535d60499e7429ac8fcf52d8278405704e	12-Mar-2012	James Dong <jdong@google.com>	Swtched to use header file in /frameworks/native o related-to-bug: 6044894 Change-Id: I192f0436572d240fd2fb88446f6fa63ba0128d7e nclude/II420ColorConverter.h vpp/Android.mk ss/stagefrightshells/src/Android.mk
75dd1750a3b7b1b4a519c33fc055e9d09dd7031c	12-Mar-2012	James Dong <jdong@google.com>	Merge "Refactored MediaBufferPuller class from VideoEditorVideoEncoder class"
18f1ff3f42aa6de3b8a5311c8886ef48980fa65f	11-Mar-2012	Jean-Michel Trivi <jmtrivi@google.com>	Update build dependency on AudioMixer header 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 vpp/VideoEditorSRC.cpp ss/src/Android.mk
09e1ef282e7b2df400a9f35feb47b48b67af0f3b	07-Mar-2012	Glenn Kasten <gkasten@google.com>	Use audio_policy_output_flags_t consistently Change-Id: I425cfd442257560dcf141d3d8599ddc7d21c1d13 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp
427e38084a16ec063983346347decf3ec461eed1	06-Mar-2012	James Dong <jdong@google.com>	Refactored MediaBufferPuller class from VideoEditorVideoEncoder class 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 ss/stagefrightshells/src/Android.mk ss/stagefrightshells/src/MediaBufferPuller.cpp ss/stagefrightshells/src/MediaBufferPuller.h ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
8162c1a9f4df4bf4733e78f5b03398b2991ba79a	02-Mar-2012	Jean-Michel Trivi <jmtrivi@google.com>	Set channel mask when opening audio sink 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 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
90b6191067990a7a3ee947d7ce08c64f780f0de7	26-Feb-2012	Mathias Agopian <mathias@google.com>	fix location of libgui headers Change-Id: I0d203f4e7aa83e0449f7ebb9f3cafe021e38fc2f vpp/NativeWindowRenderer.cpp vpp/PreviewPlayer.cpp vpp/PreviewRenderer.cpp vpp/VideoEditorPreviewController.cpp
ff63ae394b51682f5d36f3413c8f9d7367b8412e	25-Feb-2012	Mathias Agopian <mathias@google.com>	remove dependency on android_native_buffer.h Change-Id: I720d5e6ac7e4455d7ab59eab7e9c2478b911228a vpp/PreviewRenderer.h
7719f633bd8747b2f56c7be0f102ff131c074c2e	10-Feb-2012	John Grossman <johngro@google.com>	Update method sigs. Update the getNextBuffer signatures to have an additional (but ignorable) parameter used to implement timed audio output. Change-Id: Icb98e4af4d136c234ae8c5cbb4a5de4350b436bb vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h ss/src/VideoEditorResampler.cpp
49f000409c48afd40366baef2e8fc8ea838b782f	10-Feb-2012	James Dong <jdong@google.com>	Merge "Move away from MediaDebug and use ADebug instead"
ff65330bfdd2841110d8ff2a1aba3543b2cb3156	10-Feb-2012	James Dong <jdong@google.com>	Fix green frame issue 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 ss/src/M4VSS3GPP_EditVideo.c
c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da	08-Feb-2012	James Dong <jdong@google.com>	Move away from MediaDebug and use ADebug instead Change-Id: I307b3f565808ec8e3b9a4d944c6c0d1f603b04c9 vpp/DummyAudioSource.cpp vpp/DummyVideoSource.cpp vpp/NativeWindowRenderer.cpp vpp/PreviewRenderer.cpp vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorSRC.cpp ss/stagefrightshells/src/Android.mk ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorMp3Reader.cpp ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
0a684cc5346e7d95acd3c3c0582c2b0161815fb0	05-Feb-2012	James Dong <jdong@google.com>	Removed unnecessary memset before an immediate memcpy Change-Id: I447057f861bb6b7977de48a598fd5bed7e75460b vpp/VideoEditorTools.cpp
8c31ae07a170746f408445b1c23937f14c19ec51	03-Feb-2012	James Dong <jdong@google.com>	Use AACEncoder instead of OMX-based AAC software encoder to workaround issues in the video editor engine o related-to-bug: 5947347 Change-Id: I8eae8166e87e5809e2f3699f760f3a3e57895b4f ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
3d2d40ac83acbda8c161cae675c372595efd640e	28-Jan-2012	James Dong <jdong@google.com>	Clean up VideoEditorPreviewController class part one: 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 vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
2985773cff8a4984ede9985cf4aad9ce655ffd45	30-Jan-2012	James Dong <jdong@google.com>	Merge "Fix an error to deal with 0-size nal units in some AVC files"
c84b947d802116d64ca11087cfbc52fabd3c7109	28-Jan-2012	James Dong <jdong@google.com>	Fix an error to deal with 0-size nal units in some AVC files o related-to-bug: 5890998 Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1 ss/mcs/src/M4MCS_API.c
3bd45591402b94ed4481ea0ee0a9140840979c84	21-Jan-2012	James Dong <jdong@google.com>	Clean up VideoEditorGBAudioProcessing 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 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h
5ddfbe7a9c530f70582dc788c9b198d892be3950	24-Jan-2012	James Dong <jdong@google.com>	Merge "AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect."
eedda3071755b2dcf851bca8bed610de18a91d01	24-Jan-2012	James Dong <jdong@google.com>	Fix an error that missed an "=" for equality in an if statement Change-Id: Ib566226b427f5357d52c7b9c0742afa05fdd3a84 ss/mcs/src/M4MCS_API.c
727f9e1e8e1306af761765e480ac5499224db646	20-Jan-2012	James Dong <jdong@google.com>	AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect. o this patch removed the AudioPlayerBase class. o verified and passed functional tests Change-Id: I33727069ef63136979b954a9dee1c35309ef6dd4 vpp/Android.mk vpp/AudioPlayerBase.cpp vpp/AudioPlayerBase.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h
6f9028e5fd2f4dae3068c07bcb5221c5e7c515fa	20-Jan-2012	James Dong <jdong@google.com>	Merge "More source code Clean up in video editor engine"
ed6269fd78eb57dce865279f4b777a9dd096cdcc	20-Jan-2012	James Dong <jdong@google.com>	Don't allow evil constructors in VideoEditorBGAudioProcessing Change-Id: Ic525ed66308681ec62363bc90ed2cea42c165a2b vpp/VideoEditorBGAudioProcessing.h
00f742c087d92e5452d29be1fb668022b5f8a6c7	14-Jan-2012	James Dong <jdong@google.com>	More source code Clean up in video editor engine 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 vpp/Android.mk vpp/AudioPlayerBase.cpp vpp/AudioPlayerBase.h vpp/DummyAudioSource.cpp vpp/DummyAudioSource.h vpp/DummyVideoSource.cpp vpp/DummyVideoSource.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
7a4097cc526fc25a36e0f451613340a9444ca043	17-Jan-2012	James Dong <jdong@google.com>	Fix two typos in the defined frequency enums Change-Id: Ia0b6af98bd8f2ccb4d79705064a225e5f699ed8d vpp/VideoEditorSRC.h ss/src/VideoEditorResampler.cpp
4a108948e915b5c758cada106c129f56532ccf35	17-Jan-2012	Glenn Kasten <gkasten@google.com>	Merge "Use audio_stream_type_t consistently"
813c1017a499d5fe7a9ee7f40aae845954a3ba55	09-Jan-2012	Glenn Kasten <gkasten@google.com>	Use audio_stream_type_t consistently Change-Id: I0b3ba8ab74f03433d1e64cb898fa62c02535a2f1 vpp/VideoEditorPlayer.h
daeb5b33861147fda0096f9c794be6f341d884c2	12-Jan-2012	James Dong <jdong@google.com>	Remove streaming related logic from preview player. Video editor engine only deals with local file playback/preview. Change-Id: I8e3414abf8a109a77a1e34a959fb4a090612ae3d related-to-bug: 5857057 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPreviewController.cpp
8dcbd11c186e26b67de813adaec66dd578415cd7	04-Jan-2012	Glenn Kasten <gkasten@google.com>	Use audio_format_t consistently Change-Id: Idb08c49fe1a2c87ea2bb080815a5a6f95409834c vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
c0f8fbe3ded614201abac794c34669c8a9fdb696	12-Jan-2012	James Dong <jdong@google.com>	Remove unnecessary drm handling logic in PreviewPlayerBase class Change-Id: I08b1e23ecf5775deb92a262fb9ed60a464fe60c0 related-to-bug: 5857208 vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h
f8bd29c66308c820d579b3efb0942a53a277e2c5	08-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: I5c54a0185527f6ca3e746d625a007aa06f6f25f9 vpp/DummyAudioSource.cpp vpp/DummyVideoSource.cpp vpp/NativeWindowRenderer.cpp vpp/PreviewPlayer.cpp vpp/PreviewPlayerBase.cpp vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
e70ff37034fdb93f65d34704aec400ec9123e55c	06-Jan-2012	Steve Block <steveblock@google.com>	Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I605079da4a7c01e6555e2aab6f16ccf8cc6ac694 vpp/I420ColorConverter.cpp vpp/PreviewRenderer.cpp vpp/VideoEditorPreviewController.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
ec9e663f697df4254dacc79f52cdb633179c92ab	04-Jan-2012	Steve Block <steveblock@google.com>	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I261ad4d5348f4832488707edeb3cbdbb6dd12fca vpp/DummyAudioSource.cpp vpp/I420ColorConverter.cpp vpp/PreviewPlayerBase.cpp vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorPlayer.cpp ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
4ca06b0a9af472cfd13f52841fc9d2e5a6558674	20-Dec-2011	Steve Block <steveblock@google.com>	Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I17166d9fb435c85c5fd9d5fba1a39d2661c61e10 vpp/NativeWindowRenderer.cpp vpp/PreviewPlayerBase.cpp vpp/VideoEditorPreviewController.cpp
7bdbbc7e45fca8e50df91ef2e8b39d1608841c9d	16-Dec-2011	Glenn Kasten <gkasten@google.com>	ditherAndClamp from libaudioutils not AudioMixer Change-Id: I1e8a00c81efefd956fe9e4d9b58557373320e322 vpp/Android.mk vpp/VideoEditorSRC.cpp ss/src/Android.mk ss/src/VideoEditorResampler.cpp
51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787	02-Dec-2011	Hong Teng <hongteng@google.com>	am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video 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.
00b82d39c6d1b4e0594857ef5113f46775c4a065	01-Dec-2011	Hong Teng <hongteng@google.com>	Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash. Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207 ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
6f26d10ee6c337112ee5f968a436ac0ee9c6352f	22-Nov-2011	Hong Teng <hongteng@google.com>	am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs * commit '8e61113210e4c3c1ce57ecef1dda327bea85c19c': Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
c8d53b6147249440e6b99f88adc795ac82e1a050	22-Nov-2011	Hong Teng <hongteng@google.com>	Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs -Remove the additional transcoding for kenburn video in video editor saving phase. Change-Id: Ia8721ba75d4b7923db0f483bf30209c6fa40e4bd ss/src/M4xVSS_API.c
83a4cc4e3a404a02fa4af496ff48ee51581fb098	16-Nov-2011	Chih-Chung Chang <chihchung@google.com>	resolved conflicts for merge of fbb122bf to master Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963
482cedda9164b9f376dbe47644e33eb07db5b996	16-Nov-2011	Chih-Chung Chang <chihchung@google.com>	Merge "Fix 5607624: Native crash in movie studio while previewing the movie" into ics-mr1
3b8c0478e92f0c52a3bb2eca2d34effd04cf61e7	15-Nov-2011	Hong Teng <hongteng@google.com>	am 811c53c5: Fix for issue 5309336 -add videoeditor maximum 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.
2db767137112a619751b70b9947aaa064030a210	15-Nov-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5607624: Native crash in movie studio while previewing the movie Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29 vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
72425b1109ddd092048b5280889f972626a61b7e	11-Nov-2011	Hong Teng <hongteng@google.com>	Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I43c03fc626194d9ebbe8d914d9209a04bc085831 ss/mcs/src/M4MCS_API.c ss/src/M4xVSS_API.c ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
2703f23af496c13cfa39cc7e157fa12d1cb4c169	20-Oct-2011	Steve Block <steveblock@google.com>	Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531 vpp/AudioPlayerBase.cpp vpp/DummyAudioSource.cpp vpp/DummyVideoSource.cpp vpp/PreviewPlayer.cpp vpp/PreviewPlayerBase.cpp vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorSRC.cpp vpp/VideoEditorTools.cpp ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/stagefrightshells/inc/VideoEditorUtils.h ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorMp3Reader.cpp ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
e20c2c1775349da6d4a5700f0c7faaa07d62f409	20-Oct-2011	James Dong <jdong@google.com>	am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0 * commit 'f23f725773de1eb394655e657cd12f95f6250b3d': Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
a6fa59c6a798f16cb3253da7566023de3991e8aa	20-Oct-2011	James Dong <jdong@google.com>	Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
ee0ef8b405dd308cae26ead9772e9aea5be6ac14	20-Oct-2011	Hong Teng <hongteng@google.com>	am 52da22e1: Fix for 5234840 Corrupted frames in transition * commit '52da22e185f4bd4c7778706d8651a2706cdffc5b': Fix for 5234840 Corrupted frames in transition
c65d276d201f85c2ea99e79ede7b5d2bc08d25fb	20-Oct-2011	Hong Teng <hongteng@google.com>	Fix for 5234840 Corrupted frames in transition 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 ss/src/M4xVSS_API.c
799de64f085ccf2a58f0c74a151badaabd0bd679	19-Oct-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5477832 Movie Studio crash when trying to import the attached h263 file. Add support for Audio Object type 5(SBR) and 29(PS) in audio decoder node. Change-Id: I9b631893f530d0c8550a0a7addfbdce226313693 ss/mcs/src/M4MCS_API.c ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
b3c06552b415b15ad568c41281f148706f7cbd9e	19-Oct-2011	Hong Teng <hongteng@google.com>	am 71184927: Fix for 5154138 Titles are not aligned properly in a exported 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
eac28ab858dc4ecdfd25b6d8851219e6787d1222	13-Oct-2011	Hong Teng <hongteng@google.com>	Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done Change-Id: I1ff9cc868117cc8dcdc735e6854ff429b74e8154 ss/inc/M4VSS3GPP_InternalTypes.h ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c
4a4a8f0143c7ac17f88e73f76e21c6d8b63d6e20	13-Oct-2011	Andreas Huber <andih@google.com>	Remove RTSP support from libvideoeditor's PreviewPlayer... Change-Id: I2032772037c1130736081cb62bd6ce8d1270e1b9 vpp/PreviewPlayer.cpp vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h
2534acb86e3f9ea94ed989f778f2606b79536fbc	06-Oct-2011	Hong Teng <hongteng@google.com>	Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test."
e018023b4844fef7880bf5e45f706afcb10c33b6	29-Sep-2011	Hong Teng <hongteng@google.com>	Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test. Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h
93d4a21f1c73df290e26a21e7a628f28d50bd035	04-Oct-2011	James Dong <jdong@google.com>	Video editor incorrectly rejects videos that could be supported by the HW decoder Change-Id: I831b32c7ab02fa110865c88bbb02f339889d97a5 related-to-bug: 5407761 ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
eaf349aaffc89c3ff754ddef856c80097b5a79a2	22-Sep-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5205420 compression domain trimming fallback mechanism Transcode if clip's profile or level exceeds encoder's supported profile or level. Change-Id: Ib2f678828a58657b095ef6ef219fd0aa2bdccf91 ss/src/M4VSS3GPP_Edit.c ss/src/M4xVSS_API.c
738a66268a5d4ad948714dc095711cb4a21997f3	22-Sep-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other Set the alpha blending value correctly. Change-Id: I6aaed47144d09d182afb1c70d5bb72b7360fb51e ss/src/M4xVSS_internal.c
547a4fffe81be23c5dc7ef27a0c43ae0ec8f5406	15-Sep-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for 5247764 profile and level settings are not always correctly set"
276adbc8cab51c5cd60906fdbff9c7d5345ad0a6	15-Sep-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for bug 5255159 Cannot play exported movie from Movie Studio Ensure video encoder is not created and destroyed for every clip. Change-Id: I7a1d525e7bcdc839acc39d43e5046207c2d3b44f ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c
95651ebc7fbb2efba3f407f4825b7805874bbdf2	14-Sep-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5247764 profile and level settings are not always correctly set 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 ss/mcs/src/Android.mk ss/mcs/src/M4MCS_API.c ss/stagefrightshells/src/VideoEditor3gpReader.cpp
816cd5ae8896f4965b2f1a5ea72d59dcac7257cb	12-Sep-2011	Hong Teng <hongteng@google.com>	Fix for -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 ss/mcs/src/M4MCS_API.c ss/src/M4VSS3GPP_EditVideo.c
d94b927cafef95db7de0c89b6ef8f246efc37c6c	05-Sep-2011	Chih-Chung Chang <chihchung@google.com>	Enable some logs to debug 5195693. Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d vpp/VideoEditorPreviewController.cpp
e02eee1a408656be9beaf1b0ba656dd1ee103799	02-Sep-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5240036: We didn't handle the 1920x1080 resolution. Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc ss/src/M4VSS3GPP_Edit.c
e9eec0e0975c57c0dac91eb5b4cbb052b7dd011a	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 native engine part. Change-Id: Icde922194a123a90544942caa12430fc3c4ef10e vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h ss/common/inc/M4DA_Types.h ss/common/inc/M4_VideoEditingCommon.h ss/inc/M4xVSS_Internal.h ss/mcs/src/M4MCS_API.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/stagefrightshells/src/VideoEditor3gpReader.cpp
dac2f050b814bd72ff66b4ae58634c25fb2185ff	30-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Merge "Fix 5200858: we need to pass timestamp to render correct frames."
d125366181feab7e45905a8051c94ab5a845e503	29-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5200858: we need to pass timestamp to render correct frames. Change-Id: I262cefabea87f75883bcd074370deae054df3e88 ss/src/M4VSS3GPP_EditVideo.c
a007d502e7572b225124eea31defbd27b59d4161	29-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Merge "Fix 5123908: Native crash rewinding movie"
5f9cd08076587935f798b2b2eba4aa202362f532	26-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5212886: free the reader after freeing decoders. 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 ss/mcs/src/M4MCS_API.c
072be1ea494b0f4ca6d184e6c53d9ba01e539de2	26-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5200962: Handle 0-length buffers from OMXCodec and drop it. Change-Id: I67c42c41f649f8e37055721efb67ab3ca4b02f0b ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
aef59c544429aae73429a1325d43e830600e3b67	25-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5180429: Initialize native window transform to 0. Change-Id: I2730895059d408fa731dc4ca8da3f7984fe196ae vpp/PreviewRenderer.cpp
16ecf765405a22118e9d3bd2d3c22df374794dcf	19-Aug-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5151331 [CRESPO] testPerformanceExport failed Ensure encoding width and height are multiple of 16. Change-Id: Ia077a52a16273cb9f775ebe0f0c66a81a35b9e19 ss/mcs/src/M4MCS_API.c
3d974e7763495d8fda6f264810619cb3bd265293	18-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5123908: Native crash rewinding movie Simplify the VideoEditorSRC code and fix some bugs. Change-Id: I6bcf3a5cea21a2eec4b51f167560c4b0d3a04a29 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
0a25bd5bacf5408ca205b15e53cfb6dc2fc1d171	13-Aug-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 4142219 Don't hard code platform-specific limitations. 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 ss/common/inc/M4DECODER_Common.h ss/common/inc/M4ENCODER_common.h ss/common/inc/M4VD_EXTERNAL_Interface.h ss/common/inc/M4_VideoEditingCommon.h ss/inc/M4PTO3GPP_API.h ss/inc/M4VSS3GPP_ErrorCodes.h ss/inc/M4VSS3GPP_Extended_API.h ss/inc/M4VSS3GPP_InternalTypes.h ss/inc/M4xVSS_API.h ss/inc/M4xVSS_Internal.h ss/mcs/inc/M4MCS_API.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_Codecs.c ss/src/Android.mk ss/src/M4PTO3GPP_API.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_ClipAnalysis.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/stagefrightshells/inc/VideoEditorVideoDecoder.h ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
f80b313837cca881971bb0afebf23a0381fb99a0	18-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Fix 5115581: Native crash while importing audio track Add locking in storeBuffer and read. Use the Vector class to simplify the code. Change-Id: If36ddda432df2b6d6d728b27fa196d2a655e0ba4 ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
b3626dda1df18de2398d6c91647c9d544dd5f6dc	09-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Speed up thumbnail generation. 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 ss/common/inc/M4DECODER_Common.h ss/mcs/src/M4MCS_API.c ss/src/M4DECODER_Null.c ss/src/M4VSS3GPP_Clip.c ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
08b82bddf54757ad6bd243181f1b68a79bb70e6d	11-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Add connect calls for SurfaceTexture. Clean PreviewRenderer. Now connect() is necessary for SurfaceTexture. Also cleaned unused code in PreviewRenderer. Change-Id: Ic49df01e79f38a48a8c2cf194d13ee575660c834 vpp/NativeWindowRenderer.cpp vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorPreviewController.cpp
7b0a960ef4bdf5529070d575b98222f55433f243	09-Aug-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for 4132872 inefficient export logic."
6e779fda8a4f6258f9b910290b2f296d18fb2585	04-Aug-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 4132872 inefficient export logic. 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 ss/common/inc/M4DA_Types.h ss/common/inc/M4DECODER_Common.h ss/common/inc/M4DECODER_Null.h ss/common/inc/M4_VideoEditingCommon.h ss/common/inc/NXPSW_CompilerSwitches_MCS.h ss/inc/M4VSS3GPP_API.h ss/inc/M4VSS3GPP_InternalTypes.h ss/inc/M4xVSS_Internal.h ss/mcs/src/M4MCS_API.c ss/src/Android.mk ss/src/M4DECODER_Null.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_ClipAnalysis.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4VSS3GPP_MediaAndCodecSubscription.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
2aa01fd002bba1dde45791c1138c1f71a8d0aa53	05-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Rename YV12 to I420. Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0 nclude/II420ColorConverter.h nclude/IYV12ColorConverter.h vpp/Android.mk vpp/I420ColorConverter.cpp vpp/I420ColorConverter.h vpp/NativeWindowRenderer.cpp vpp/NativeWindowRenderer.h vpp/YV12ColorConverter.cpp vpp/YV12ColorConverter.h ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
43fcc396614a587851e2b7c4cea2876ec58b8648	02-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Use GL to render preview. 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 vpp/Android.mk vpp/NativeWindowRenderer.cpp vpp/NativeWindowRenderer.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
b9410c5dacdb44f2f19bc2487dd9ef84445e1f32	04-Aug-2011	James Dong <jdong@google.com>	Merge "Remove excessive logging"
cece4b32d340f0ca514160647b9883e3777bc376	01-Aug-2011	Chih-Chung Chang <chihchung@google.com>	Remove unused mLastVideoBuffer and bAppliedVideoEffect. Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h
48a29a976eb649f9c90e9d69214747d1aa659de1	02-Aug-2011	James Dong <jdong@google.com>	Remove excessive logging Change-Id: Ie0b37da59ad326184c983626c45ea78908e7c2b7 related-to-bug: 5109084 vpp/PreviewPlayerBase.cpp
e048e90967aa52e01b6b3ca445e4ade75c0dc878	31-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Remove PreviewLocalRenderer (simplify the code). Change-Id: I1f04e591cd0a33eb70bd93d5600aba12e727386e vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h
2d461d443d4d0a35acb9cfd49cafad8941b17a0b	28-Jul-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 5083973 M4VSS3GPP_editCleanUp called twice problem. Set VSS context to NULL after cleanup. Change-Id: I1086fbe60a7777b00e80f0ea504f58a183fd3241 ss/src/M4xVSS_internal.c
76cdb30c5bf3110354051aca2a16b5c8fbad3398	27-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Remove unnecessary encoder input format check. 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 ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
7efb8efc88ba529c1c57366a305855c2051ebb8b	22-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Add YV12 color converter interface for VideoEditor. 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 nclude/IYV12ColorConverter.h vpp/Android.mk vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/YV12ColorConverter.cpp vpp/YV12ColorConverter.h ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/src/Android.mk ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
abb85fd9090817686bbdaa5a5b29547728a8d385	26-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Clear buffer lists in stop() so we won't free the buffers again. Bug: 5073626 Change-Id: Ia41fc089568b48de005235d66c9b5b1a5f72b5ca ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
8a1f7cc319b9c3c8d40fefb4439c746e5b250820	22-Jul-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 5055001 Movie studio is unusable after importing music Change-Id: I9b3da1122e807c034cf44dd51b5e1d92dd84d73f ss/mcs/src/M4MCS_API.c
f3fd9435441ce19b45d17bf17d2fa4510c13cd7a	21-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Merge "Remove hard-coded requirement for number of buffers."
0aaa69f88effc1c7d154c727d67d358100b53848	21-Jul-2011	Hong Teng <hongteng@google.com>	Merge "fix for issue 4142219 Don't hard code platform-specific limitations engine part."
8806b706693c0992724f6603353af18aeb4a0f80	07-Jul-2011	Hong Teng <hongteng@google.com>	fix for issue 4142219 Don't hard code platform-specific limitations engine part. Change-Id: Ibc8a539e5bbac738f60ef935670a333b7017e20e vpp/PreviewPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h ss/common/inc/M4ENCODER_common.h ss/common/inc/M4_VideoEditingCommon.h ss/mcs/src/M4MCS_API.c ss/src/M4PTO3GPP_API.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
9ea1fc71df220b6bf610587ed15b6e400a215da5	21-Jul-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for issue 4988956 No audio can be heard during preview"
1c3c54395729dfae20357d4e510038084cc416cc	20-Jul-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 4988956 No audio can be heard during preview Change-Id: I61fc9086f2c00259e4f54535a5938b161d95b144 vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
1b37de259e00e22f261f2711e0a318aa386581c7	19-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Remove hard-coded requirement for number of buffers. 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 ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
460ba2a3a1fa9318463d3c00595b6732e3d776de	19-Jul-2011	Mathias Agopian <mathias@google.com>	call the new setScaling method in the appropriate places Change-Id: Iabd738b195d326b6bdf04fdfee75e1dd9d411cbd vpp/PreviewRenderer.cpp
2857b959c5c12116bef85d4e7e0125d74a469eec	15-Jul-2011	Mathias Agopian <mathias@google.com>	Merge "Use the ANativeWindow APIs instead of the Surface APIs"
f70947fcd251dffbbf29414cf43bea971d9df3e8	14-Jul-2011	Mathias Agopian <mathias@google.com>	Use the ANativeWindow APIs instead of the Surface APIs Surface inherits from ANativeWindow, the APIs on the later are the only public APIs. Change-Id: Ibddebfe535e026d872cc13287a102660c004385f vpp/PreviewRenderer.cpp
3d34a30c5ecf404b429ade5068400cb86695ff32	14-Jul-2011	Andreas Huber <andih@google.com>	Remove redundant include, now that NuHTTPDataSource.h is no more. Change-Id: I7bed503ba341b5ea3b7a3cac7aa2a1f349c8ed03 vpp/PreviewPlayer.h
334655795fb9b23eb8d011c6f7ccf807816f74f0	12-Jul-2011	Jeff Brown <jeffbrown@google.com>	Merge "Remove the simulator target from all makefiles. Bug: 5010576"
2dade0141b45b3538183bd2d6c0c53a0345e92af	12-Jul-2011	Jeff Brown <jeffbrown@google.com>	Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: Ida75833739d363061c2e688a6c7f7d7b3f3edd1e vpp/Android.mk sal/src/Android.mk ss/3gpwriter/src/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/video_filters/src/Android.mk
6d566304093bc0f79b47d96ed8d840620c163264	11-Jul-2011	Chih-Chung Chang <chihchung@google.com>	Fix 4973565: implement getFormat() like Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe. Change-Id: I9c684fa971d5ef3f975017cbaaf06ba789a6c41f ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
bc8e52dadeb078c45e62ebda17fd95e67f689654	02-Jul-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix of issue 4973565 Cannot export movie. Also fixes 4441452 Native Crash after applying transition Change-Id: Ic48c44bc2c5d07e57edb8f63393cea424d3275f4 sal/inc/M4OSA_Error.h ss/common/inc/M4AD_Common.h ss/mcs/src/M4MCS_API.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_EditAudio.c ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
b13adac0f1ce1792151192966e428d1eed3ef826	01-Jul-2011	James Dong <jdong@google.com>	Merge "add private copy constructor and assignment operator to four media source classes"
e946f0bfe7f5c63d4b10497ccc87ddb5b002b51d	29-Jun-2011	James Dong <jdong@google.com>	add private copy constructor and assignment operator to four media source classes o this patch addresses the encoder and decoder sources for audio and video Change-Id: I918784ca22138267c270836c91312540eedebc7f ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
7dbd2c46824000ce473966637c11b8564682cb55	30-Jun-2011	Chih-Chung Chang <chihchung@google.com>	Remove curtain effects (they are unused). Change-Id: I8e1ccad3e9ddf4c272e85e7ca04582b4863c242d vpp/PreviewPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h ss/common/inc/M4VFL_transition.h ss/inc/M4VSS3GPP_API.h ss/inc/M4VSS3GPP_ErrorCodes.h ss/src/M4VSS3GPP_EditVideo.c ss/video_filters/src/M4VFL_transition.c
9969866cfe5b17c6e481b90d81b011a0cece78a0	30-Jun-2011	Chih-Chung Chang <chihchung@google.com>	Make line-ending consistent (unix style). Change-Id: Id837b042952ff5d97907591f337b2222cff2c8a9 ndroid.mk vpp/Android.mk vpp/DummyAudioSource.h vpp/DummyVideoSource.cpp vpp/DummyVideoSource.h vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorAudioPlayer.h vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h sal/Android.mk sal/src/Android.mk ss/stagefrightshells/Android.mk ss/video_filters/src/M4VIFI_RGB565toYUV420.c ss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
9dd21dd09e821d24eda6af225fa173f4aa2d366c	29-Jun-2011	James Dong <jdong@google.com>	Simplified regulBitRate() method and fixed a copy and paste error in stop() method Change-Id: I589aea9471130e690594f91598853a1f08dca081 ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
67b47c917296a539081c55e71880fda98e0cc219	28-Jun-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails"
01158eac3464fc6e7837be594d6a8d14172154bc	27-Jun-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails Change-Id: I353bd9e8aa1eceb9c14040a9953777967500fb1d ss/common/inc/M4AD_Common.h ss/mcs/src/M4MCS_API.c ss/src/M4VSS3GPP_Clip.c ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
9540d81f926a92b2c44618c212b9efff359dc090	27-Jun-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 4949999 getFormat() returns NULL Change-Id: Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4	27-Jun-2011	James Dong <jdong@google.com>	Fix copy and paste errors for mime type strings in the 3GP reader Change-Id: Ia91b06f4dba9e4265260b28aabeeffeceff6d157 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
b5c7784c96a606890eb8a8b560153ef4a5d1a0d9	23-Jun-2011	Thomas Le Guevel <thomaslg@google.com>	Fix for: 4676350 Do not use dual copyright declaration for video editor code Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be vpp/Android.mk vpp/DummyAudioSource.cpp vpp/DummyAudioSource.h vpp/DummyVideoSource.cpp vpp/DummyVideoSource.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h sal/inc/LVOSA_FileReader_optim.h sal/inc/LV_Macros.h sal/inc/M4OSA_CharStar.h sal/inc/M4OSA_Clock.h sal/inc/M4OSA_CoreID.h sal/inc/M4OSA_Debug.h sal/inc/M4OSA_Error.h sal/inc/M4OSA_Export.h sal/inc/M4OSA_FileCommon.h sal/inc/M4OSA_FileCommon_priv.h sal/inc/M4OSA_FileReader.h sal/inc/M4OSA_FileReader_priv.h sal/inc/M4OSA_FileWriter.h sal/inc/M4OSA_FileWriter_priv.h sal/inc/M4OSA_Memory.h sal/inc/M4OSA_Mutex.h sal/inc/M4OSA_OptionID.h sal/inc/M4OSA_Semaphore.h sal/inc/M4OSA_Thread.h sal/inc/M4OSA_Thread_priv.h sal/inc/M4OSA_Time.h sal/inc/M4OSA_Types.h sal/src/Android.mk sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_CharStar.c sal/src/M4OSA_Clock.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_FileReader.c sal/src/M4OSA_FileWriter.c sal/src/M4OSA_Mutex.c sal/src/M4OSA_Random.c sal/src/M4OSA_Semaphore.c sal/src/M4OSA_Thread.c sal/src/M4PSW_DebugTrace.c sal/src/M4PSW_MemoryInterface.c sal/src/M4PSW_Trace.c ss/3gpwriter/inc/M4MP4W_Types.h ss/3gpwriter/inc/M4MP4W_Utils.h ss/3gpwriter/inc/M4MP4W_Writer.h ss/3gpwriter/src/Android.mk ss/3gpwriter/src/M4MP4W_Interface.c ss/3gpwriter/src/M4MP4W_Utils.c ss/3gpwriter/src/M4MP4W_Writer.c ss/common/inc/From2iToMono_16.h ss/common/inc/LVM_Types.h ss/common/inc/M4AD_Common.h ss/common/inc/M4AD_Null.h ss/common/inc/M4AIR_API.h ss/common/inc/M4AMRR_CoreReader.h ss/common/inc/M4Common_types.h ss/common/inc/M4DA_Types.h ss/common/inc/M4DECODER_Common.h ss/common/inc/M4ENCODER_AudioCommon.h ss/common/inc/M4ENCODER_common.h ss/common/inc/M4OSA_CoreID.h ss/common/inc/M4PCMR_CoreReader.h ss/common/inc/M4READER_3gpCom.h ss/common/inc/M4READER_Amr.h ss/common/inc/M4READER_Common.h ss/common/inc/M4READER_Pcm.h ss/common/inc/M4SYS_AccessUnit.h ss/common/inc/M4SYS_Stream.h ss/common/inc/M4TOOL_VersionInfo.h ss/common/inc/M4VD_EXTERNAL_Interface.h ss/common/inc/M4VD_Tools.h ss/common/inc/M4VFL_transition.h ss/common/inc/M4VIFI_Clip.h ss/common/inc/M4VIFI_Defines.h ss/common/inc/M4VIFI_FiltersAPI.h ss/common/inc/M4VPP_API.h ss/common/inc/M4WRITER_common.h ss/common/inc/M4_BitStreamParser.h ss/common/inc/M4_Common.h ss/common/inc/M4_Utils.h ss/common/inc/M4_VideoEditingCommon.h ss/common/inc/MonoTo2I_16.h ss/common/inc/NXPSW_CompilerSwitches.h ss/common/inc/NXPSW_CompilerSwitches_MCS.h ss/common/inc/SSRC.h ss/common/inc/VideoEditorResampler.h ss/common/inc/marker.h ss/inc/M4EXIFC_CommonAPI.h ss/inc/M4PTO3GPP_API.h ss/inc/M4PTO3GPP_ErrorCodes.h ss/inc/M4PTO3GPP_InternalTypes.h ss/inc/M4VSS3GPP_API.h ss/inc/M4VSS3GPP_ErrorCodes.h ss/inc/M4VSS3GPP_Extended_API.h ss/inc/M4VSS3GPP_InternalConfig.h ss/inc/M4VSS3GPP_InternalFunctions.h ss/inc/M4VSS3GPP_InternalTypes.h ss/inc/M4xVSS_API.h ss/inc/M4xVSS_Internal.h ss/mcs/inc/M4MCS_API.h ss/mcs/inc/M4MCS_ErrorCodes.h ss/mcs/inc/M4MCS_InternalConfig.h ss/mcs/inc/M4MCS_InternalFunctions.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/Android.mk ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_AudioEffects.c ss/mcs/src/M4MCS_Codecs.c ss/mcs/src/M4MCS_MediaAndCodecSubscription.c ss/mcs/src/M4MCS_VideoPreProcessing.c ss/src/Android.mk ss/src/M4AD_Null.c ss/src/M4AIR_API.c ss/src/M4AMRR_CoreReader.c ss/src/M4ChannelConverter.c ss/src/M4PCMR_CoreReader.c ss/src/M4PTO3GPP_API.c ss/src/M4PTO3GPP_VideoPreProcessing.c ss/src/M4READER_Amr.c ss/src/M4READER_Pcm.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VD_Tools.c ss/src/M4VIFI_xVSS_RGB565toYUV420.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_ClipAnalysis.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditAudio.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4VSS3GPP_MediaAndCodecSubscription.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/src/VideoEditorResampler.cpp ss/stagefrightshells/inc/VideoEditor3gpReader.h ss/stagefrightshells/inc/VideoEditorAudioDecoder.h ss/stagefrightshells/inc/VideoEditorAudioEncoder.h ss/stagefrightshells/inc/VideoEditorBuffer.h ss/stagefrightshells/inc/VideoEditorMp3Reader.h ss/stagefrightshells/inc/VideoEditorUtils.h ss/stagefrightshells/inc/VideoEditorVideoDecoder.h ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/inc/VideoEditorVideoEncoder.h ss/stagefrightshells/src/Android.mk ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorMp3Reader.cpp ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp ss/video_filters/src/Android.mk ss/video_filters/src/M4VFL_transition.c ss/video_filters/src/M4VIFI_BGR565toYUV420.c ss/video_filters/src/M4VIFI_Clip.c ss/video_filters/src/M4VIFI_RGB565toYUV420.c ss/video_filters/src/M4VIFI_RGB888toYUV420.c ss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c ss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c ss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c ss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
72e95e7ee6fe2892201575e7f7e4dd798fb225f6	02-Jun-2011	Glenn Kasten <gkasten@google.com>	Revert "Use AudioTrack::event_type not int in callback" This reverts commit dd51bdc4cf4b7c9f09e7dc4116651c6681d5287c vpp/AudioPlayerBase.cpp vpp/AudioPlayerBase.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
984eae0d1715c2caa6da6cccb55b919db9da1da2	05-May-2011	Glenn Kasten <gkasten@google.com>	Use AudioTrack::event_type not int in callback Change-Id: I09ff321f9457c0a9ee58e59bee38ed53799e494b vpp/AudioPlayerBase.cpp vpp/AudioPlayerBase.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
272eb55a3855d8455bc0a12e5359d51f4010332a	11-May-2011	Dima Zavin <dima@android.com>	update for new audio.h header location Change-Id: I593b91a84a603d8c7f51a83232cced5af4980baf Signed-off-by: Dima Zavin <dima@android.com> vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp
8f83a8f53ed652e9e910a60e46634a5f49cdc783	06-May-2011	Thomas Le Guevel <thomaslg@google.com>	Merge "Fix for issue 4035003 Support for 64 bit datatype a. M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h"
aa382f3637a68361989d5b70e3184bddcc472d3d	23-Apr-2011	hongteng <hongteng@google.com>	Fix for issue 4035003 Support for 64 bit datatype a. M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h Change-Id: I2b1751962945dcc668e995d05a57b66cd268642f sal/inc/M4OSA_FileCommon.h sal/inc/M4OSA_FileCommon_priv.h sal/inc/M4OSA_Time.h sal/inc/M4OSA_Types.h sal/src/M4OSA_CharStar.c sal/src/M4OSA_Clock.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_FileReader.c sal/src/M4OSA_FileWriter.c ss/3gpwriter/src/M4MP4W_Writer.c ss/common/inc/M4DA_Types.h ss/mcs/src/M4MCS_API.c ss/src/M4AMRR_CoreReader.c ss/src/M4READER_Amr.c ss/src/M4READER_Pcm.c ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorMp3Reader.cpp
3b9ba852fc80769afab1d9387a9642320a714063	04-May-2011	James Dong <jdong@google.com>	Clean up background audio processing code Change-Id: I6184e71cb0ccfdb1fc5f250bd7ecd4555efad482 vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h
74d808e9a6ab4dee6f30790eda5bf67e493a8ea5	04-May-2011	Iliyan Malchev <malchev@google.com>	Merge "android_native_buffer_t --> ANativeWindowBuffer"
b003895a249f1298c311f513bbb0bf96e3902ef4	01-May-2011	Iliyan Malchev <malchev@google.com>	android_native_buffer_t --> ANativeWindowBuffer Change-Id: Id43b27ed2d1b85488b731948d018da0c0fd0c50d Signed-off-by: Iliyan Malchev <malchev@google.com> vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h
e6815bf8b4eaf9cc861e389cbebe3d7412698e9f	03-May-2011	James Dong <jdong@google.com>	Clean up VideoEditorSRC o removed unused member variables o removed pre-processor for FROYO, since we only made video editor available after HC. o cleaned up the header includes Change-Id: I101775cc384310d661a65485113ac1bc1f6cdf17 vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
2dbef65fea1115c53edda5bd4b40c4f49c0d06dd	03-May-2011	James Dong <jdong@google.com>	Cleaned up dummy audio and video sources o remove unused member variables o replace a full loop with a memset Change-Id: Ib482525a321c2a17dd188fba47b642c63ab811c3 vpp/DummyAudioSource.cpp vpp/DummyAudioSource.h vpp/DummyVideoSource.h
e84b6c0d8b1c969975560726ca1cf87d5c676ad6	03-May-2011	James Dong <jdong@google.com>	Fix a typo in filename "M4ChannelCoverter.c" Change-Id: If7e3afa8ac10fc34e920a199fd31526ced0a2534 ss/src/Android.mk ss/src/M4ChannelConverter.c ss/src/M4ChannelCoverter.c
c9dedc4e1d0c8343ab1029cb601253826cd67c81	01-May-2011	James Dong <jdong@google.com>	Separate preview player from AwesomePlayer and also video editor audio player from AudioPlayer Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4 vpp/Android.mk vpp/AudioPlayerBase.cpp vpp/AudioPlayerBase.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewPlayerBase.cpp vpp/PreviewPlayerBase.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h
acb62af8ccf493b38decd91d94eb18395b6f9461	26-Apr-2011	Gloria Wang <gwang@google.com>	Add setParameter/getParameter to MediaPlayer API for bug 1982947 Change-Id: Ic32704367bdcf2ade3f035a164927e95c69af7fa vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
6859837b0bdea82be855ab50bd69c5ac9b62acf2	06-Apr-2011	Dima Zavin <dima@android.com>	libvideoeditor: convert to use new audio.h Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2 Signed-off-by: Dima Zavin <dima@android.com> vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPlayer.cpp
0a389ab70db304fb840e33f33781ecc0503eae3c	22-Apr-2011	hongteng <hongteng@google.com>	Fix for issue 3385135 "source code cleanup" engine part - Removed below unused functions a. M4PTO3GPP_RegisterExternalVideoEncoder b. M4VSS3GPP_editRegisterExternalVideoDecoder c. M4VSS3GPP_editRegisterExternalVideoEncoder d. M4VSS3GPP_extractPictureRegisterExternalVideoDecoder e. M4VSS3GPP_editRegisterExternalCodec f. M4VSS3GPP_editSubscribeExternalCodecs g. M4VSS3GPP_intSubscribeExternalCodecs h. M4VSS3GPP_intClipRegisterExternalVideoDecoder i. M4xVSS_RegisterExternalVideoDecoder j. M4xVSS_RegisterExternalVideoEncoder k. M4MCS_registerExternalVideoDecoder l. M4MCS_registerExternalVideoEncoder m. M4MCS_registerExternalAudioDecoder n. M4MCS_registerExternalAudioEncoder o. M4DECODER_EXTERNAL_getInterface - Also remove small code associated with these functions and Remove below unsused src + header files a. M4CLOCK.h b. M4MDP_API.h c. M4VD_EXTERNAL_Internal.h d. M4VD_HW_API.h e. M4VE_API.h f. M4_Logo.h g. M4VD_EXTERNAL_Interface.c h. LV_Types.h i. M4OSA_FileAccess.h j. M4OSA_FileCache.h k. M4OSA_FileExtra.h l. M4OSA_FileReaderRam.h m. M4OSA_FileWriterRam.h n. M4OSA_String.h o. M4OSA_String_priv.h p. M4OSA_FileCache.c q. M4OSA_FileExtra.c r. M4OSA_FileReader_RAM.c s. M4OSA_FileWriter_RAM.c t. M4OSA_String.c u. M4OSA_String_priv.c Change-Id: I7271cbe92168e665a8e5b7afe7c7fe1c331eaa1e sal/inc/LV_Types.h sal/inc/M4OSA_FileAccess.h sal/inc/M4OSA_FileCache.h sal/inc/M4OSA_FileExtra.h sal/inc/M4OSA_FileReaderRam.h sal/inc/M4OSA_FileWriterRam.h sal/inc/M4OSA_String.h sal/inc/M4OSA_String_priv.h sal/src/M4OSA_FileCache.c sal/src/M4OSA_FileExtra.c sal/src/M4OSA_FileReader_RAM.c sal/src/M4OSA_FileWriter_RAM.c sal/src/M4OSA_String.c sal/src/M4OSA_String_priv.c ss/common/inc/M4CLOCK.h ss/common/inc/M4ENCODER_AudioCommon.h ss/common/inc/M4MDP_API.h ss/common/inc/M4VD_EXTERNAL_Interface.h ss/common/inc/M4VD_EXTERNAL_Internal.h ss/common/inc/M4VD_HW_API.h ss/common/inc/M4VE_API.h ss/common/inc/M4_Logo.h ss/inc/M4PTO3GPP_API.h ss/inc/M4PTO3GPP_InternalTypes.h ss/inc/M4VSS3GPP_API.h ss/inc/M4VSS3GPP_InternalFunctions.h ss/inc/M4VSS3GPP_InternalTypes.h ss/inc/M4xVSS_API.h ss/inc/M4xVSS_Internal.h ss/mcs/inc/M4MCS_API.h ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_BitstreamParser.c ss/src/Android.mk ss/src/M4ChannelCoverter.c ss/src/M4PTO3GPP_API.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VD_EXTERNAL_Interface.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_Edit.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2	22-Apr-2011	hongteng <hongteng@google.com>	Fix for issue 3385135 "source code cleanup" engine part - remove commented code - remove code under #if 0 - remove macro FILE_LOWER_CASE as it is not used - remove macro #if 1 - remove TIMESCALE_BUG macro, and all code under this macro as it is not used - remove following unused functions: * M4MCS_getExifInfo * M4MCS_registerAudioEncoderExtended * M4MCS_registerVideoDecoderExtended * M4MCS_registerAudioDecoderExtended * M4MCS_registerVideoEncoderExtended Change-Id: I8e2916d956af6d381ae1962fedc61a8b48f60ce2 vpp/VideoEditorTools.cpp sal/inc/M4OSA_Memory.h sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_Thread.c sal/src/M4PSW_MemoryInterface.c ss/inc/M4xVSS_Internal.h ss/mcs/inc/M4MCS_API.h ss/mcs/inc/M4MCS_InternalFunctions.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/Android.mk ss/mcs/src/M4MCS_API.c ss/src/M4ChannelCoverter.c ss/src/M4PTO3GPP_API.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VD_EXTERNAL_Interface.c ss/src/M4VIFI_xVSS_RGB565toYUV420.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditAudio.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp ss/video_filters/src/M4VFL_transition.c
694816d7291f17364502ac5d3319684a0b180860	21-Apr-2011	Shyam Pallapothu <shyamp@google.com>	Fix for issue 4133431 "Remove OSAL layer" in engine part Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44 vpp/DummyVideoSource.cpp vpp/PreviewPlayer.cpp vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp sal/inc/LV_Macros.h sal/inc/LV_Types.h sal/inc/M4OSA_Memory.h sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_CharStar.c sal/src/M4OSA_FileCache.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_FileExtra.c sal/src/M4OSA_FileReader_RAM.c sal/src/M4OSA_FileWriter_RAM.c sal/src/M4OSA_Mutex.c sal/src/M4OSA_Semaphore.c sal/src/M4OSA_String.c sal/src/M4OSA_String_priv.c sal/src/M4OSA_Thread.c sal/src/M4PSW_MemoryInterface.c ss/3gpwriter/src/M4MP4W_Interface.c ss/3gpwriter/src/M4MP4W_Utils.c ss/3gpwriter/src/M4MP4W_Writer.c ss/common/inc/M4VD_Tools.h ss/inc/M4VSS3GPP_InternalTypes.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_Codecs.c ss/mcs/src/M4MCS_VideoPreProcessing.c ss/src/M4AD_Null.c ss/src/M4AIR_API.c ss/src/M4AMRR_CoreReader.c ss/src/M4PCMR_CoreReader.c ss/src/M4PTO3GPP_API.c ss/src/M4READER_Amr.c ss/src/M4READER_Pcm.c ss/src/M4VD_EXTERNAL_Interface.c ss/src/M4VD_Tools.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditAudio.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/stagefrightshells/inc/VideoEditorUtils.h ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorMp3Reader.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/video_filters/src/M4VIFI_RGB565toYUV420.c ss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
32ed3f4dad00f8a65f7e6b38402c70d5341c57eb	21-Apr-2011	Shyam Pallapothu <shyamp@google.com>	Fix for issue 4133431 "Remove OSAL layer" in engine part Change-Id: I9e2e142bcdf3153c529b790e368caea4fdb65ac8 vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp sal/inc/M4OSA_Memory.h sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_Thread.c sal/src/M4PSW_MemoryInterface.c ss/3gpwriter/src/M4MP4W_Utils.c ss/3gpwriter/src/M4MP4W_Writer.c ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_BitstreamParser.c ss/mcs/src/M4MCS_VideoPreProcessing.c ss/src/M4AD_Null.c ss/src/M4AIR_API.c ss/src/M4PCMR_CoreReader.c ss/src/M4PTO3GPP_API.c ss/src/M4PTO3GPP_VideoPreProcessing.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_ClipAnalysis.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditAudio.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/stagefrightshells/inc/VideoEditorUtils.h ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp ss/video_filters/src/M4VFL_transition.c
947721ba962c19913b76658cdbb19ae8c77c9c50	12-Apr-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue 4133431 "Remove OSAL layer" in engine part Change-Id: I79efc956aa0d23fb333d12c8947b48455b7524d1 sal/inc/M4OSA_CharStar.h sal/inc/M4OSA_Types.h sal/src/Android.mk sal/src/M4OSA_CharStar.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_Thread.c ss/3gpwriter/src/M4MP4W_Interface.c ss/src/M4PCMR_CoreReader.c ss/src/M4VSS3GPP_Clip.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
ddc7e59ee4aa418b809e37d2bcbf169e205a6150	06-Apr-2011	Mathias Agopian <mathias@google.com>	Merge "remove unused references to ISurface"
6e2242974c109e85bac50550970fe84009c76f77	06-Apr-2011	Mathias Agopian <mathias@google.com>	remove unused references to ISurface Change-Id: Ia11c5f46f38c0b00ca63d19d3484bf4024cdb75d vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
838daafc9d267b3a72abe1eeb84971a41ebb2050	04-Apr-2011	Andreas Huber <andih@google.com>	Bring videoeditor copies of internal code in sync with recent changes to the originals Change-Id: Ie534360f9f1f7757c57cffabb0fa4b4903422ecb related-to-bug: 4193552 vpp/VideoEditorAudioPlayer.cpp
d9789f20d5a5c4117f79c8fd46fc57ca5c125775	26-Mar-2011	Mathias Agopian <mathias@google.com>	replace libsurfaceflinger_client by libgui Change-Id: I50b43cd8a75b8a013ad5f778708dfbc09c1d76d6 vpp/Android.mk ss/stagefrightshells/src/Android.mk
d2abe6d4b4b5eee7aef725e4fa3a39807ba6dd57	22-Mar-2011	Raghavender Palla <rpalla@google.com>	am 2d449791: Fix for the issue: TestPreviewWithTransition fails (4133108) * commit '2d44979102ca85d5c4ee68d0388ee2fe37c4ec1a': Fix for the issue: TestPreviewWithTransition fails (4133108)
fa31daff175709d2c58d61d1354daa9495696631	19-Mar-2011	Raghavender Palla <rpalla@google.com>	Fix for the issue: TestPreviewWithTransition fails (4133108) Change-Id: I53eb798f4f86e83f8a4668c7256241367c1ccbe4 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp
61a422a5278107d2ca0027c371aac6110e1e0e65	16-Mar-2011	Raghavender Palla <rpalla@google.com>	am fb4d3b2d: Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle * commit 'fb4d3b2d94f3f72b7ba13b6dfc17ba215dda2c03': Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle
ebf40154a222c864a0aaf807702fc4eb6b9cf40f	15-Mar-2011	Raghavender Palla <rpalla@google.com>	Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle Change-Id: I3463581138e20e1a00f51183d3be013d6b2cd43f vpp/PreviewPlayer.cpp
68e98a29992bd61d03db0a2b95b87bb2ccfdf824	14-Mar-2011	Iliyan Malchev <malchev@google.com>	frameworks/media/libvideoeditor: remove LOCAL_PRELINK_MODULE Change-Id: Ib3ecb46e1ecc192edae2d5634798efffccbb6c94 Signed-off-by: Iliyan Malchev <malchev@google.com> vpp/Android.mk sal/src/Android.mk ss/3gpwriter/src/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/video_filters/src/Android.mk
b6b87f50e929c1c821f2f0ea5a31951e6cd76919	14-Mar-2011	Rajneesh Chowdury <rajneeshc@google.com>	am a60cb935: Fix for 4084134 End transition applied on image does not show up in previewer when playback * commit 'a60cb935edd049ecf4c7ee985d562fff6c703372': Fix for 4084134 End transition applied on image does not show up in previewer when playback
9a8c9a848da5a4a06c5402d6716efa66b8818d37	11-Mar-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 4084134 End transition applied on image does not show up in previewer when playback Change-Id: I72ee9fe95f038c07b6ccfe3305aa6436e882eedf vpp/PreviewPlayer.cpp
2cdb2152dce736f79e5f514dd53d5a5e99a6f8e2	12-Mar-2011	Ying Wang <wangying@google.com>	Remove unused LOCAL_LDFLAGS LOCAL_LDFLAGS is never used when building static library. Change-Id: I55c093b1ab1c58081bcbc4d9d91f45025115536c ss/stagefrightshells/src/Android.mk
1dd524b567ef1bb0591eb8adce10d43841376f5d	04-Mar-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3453519: do not allow editing of DRM protected contents Change-Id: I19f56cbdaab0ddb3d1ab0aec8dcf625a3ff3ead2 ss/mcs/inc/M4MCS_ErrorCodes.h ss/mcs/src/M4MCS_API.c ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorMp3Reader.cpp
2f79a1507183bbbf7bd571ad590baf1c242e5bc4	07-Mar-2011	James Dong <jdong@google.com>	Merge "Change trace labels" into honeycomb-mr1
100d01836041713337dd9532e417fb010bfb381c	04-Mar-2011	Basavapatna Dattaguru <dattaguru@google.com>	Fix for issue 3371667: fix source code compilation warnings(Moved from master) Change-Id: Ife1fc3f89beae498a49970ab5d2a080a112ce7c2 vpp/DummyAudioSource.cpp vpp/DummyVideoSource.cpp vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorPreviewController.cpp ss/common/inc/VideoEditorResampler.h ss/inc/M4VSS3GPP_InternalTypes.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/M4MCS_API.c ss/src/M4VD_EXTERNAL_Interface.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/VideoEditorResampler.cpp
f24e48bbbc93da7655aabe04adf42eff2efcf69e	04-Mar-2011	James Dong <jdong@google.com>	Change trace labels bug - 3385135 Change-Id: Iad66e122a9e2ce7cce26779f679cbf04dd1a5434 sal/src/M4PSW_Trace.c
0a8f12903f52c4f2b718123bf7e1232acfa19c20	02-Mar-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for issue 3427268 Crash when stopping playback"
1e2469c689feeb2e90a38900151e2ef1e6117d07	02-Mar-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 3427268 Crash when stopping playback Change-Id: I4cd615ffa8c5db39ec34dc14f6b09fad55cae263 vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
fe288aa71450ebe04eb74d06a3ea887c6009aacb	02-Mar-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3495914: (In Preview) Video clip switches between start and end Change-Id: Ib11c069127b3e81cfc741fab5a4f05a21d382c6b vpp/PreviewPlayer.cpp
408e25b2508d97f7ae0b39acf46ab42b7c223c44	28-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	FIX for Issue Fix for issue 3371667: fix source code compilation warnings(3) Change-Id: I15e8572cbce7443fba9afcd494a92038a5a0bd43 vpp/PreviewPlayer.cpp
52dcba93c4cde086113f7e57a6c81d3314e69121	28-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	Merge "Fix for issue 3371667: fix source code compilation warnings"
b6e2b5cc5b71986b06cbd9c471b63eb5878a7aea	26-Feb-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for memory leak with single audio player instance Change-Id: Idb0d24ac1a4fbe21c5f63871a4c7da2beb90e516 vpp/PreviewPlayer.cpp vpp/VideoEditorAudioPlayer.cpp
14c690d6a5696d681b35f2d0e5f75a11fdae4c2a	26-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	Fix for issue 3371667: fix source code compilation warnings Change-Id: I6cb6950af55effe0da6d421eaa5feb179be68158 vpp/VideoEditorTools.cpp
a5872f770c50da1db555d53e062a9896ea4321d5	25-Feb-2011	Andreas Huber <andih@google.com>	And again keep this copy of our internal sources in sync, so much fun... Change-Id: I4b588f14ba2d06d3163615557fd97fc2a5f6ca47 related-to-bug: 3375737 vpp/PreviewPlayer.cpp
4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49	14-Feb-2011	Glenn Kasten <gkasten@google.com>	Bug 3438258 surface textures This is sufficient to build, but is not a full implementation. See bug 3467199 for the real implementation. Change-Id: Ifc3325fa9b019669bffddfd7bfd10bce57d0a136 vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h
d67e9da63323d965760337913f86de28024531a4	24-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	VideoEditor: Issue ID: 3371667: Fix Set1 Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016 sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_FileCache.c sal/src/M4OSA_FileCommon.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4VSS3GPP_MediaAndCodecSubscription.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
3b84c8f8ab84915c93e2f6d0b32f2139afd95ed6	23-Feb-2011	Rajneesh Chowdury <rajneeshc@google.com>	Merge "Fix for 3369917 Audio skips at clip edit points"
1c97d9ab52a288d24ea54499de435277cc1a3d68	22-Feb-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for 3369917 Audio skips at clip edit points Change-Id: Iba66585cc2e679475d8db529d6113586b58e626e vpp/DummyAudioSource.cpp vpp/DummyAudioSource.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
226c1e7cd1a0312d84bfc3fb066f264aa6d8e026	22-Feb-2011	Santosh Madhava <smadhava@google.com>	Merge "Fix for issue 3456689 : Export failed with Runtime error"
9971f10e1f962201da9fa2b180e7332bc3c55c4a	22-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3456689 : Export failed with Runtime error Change-Id: I402601590a39d71cf8bd25379f3fdd7915078c9d sal/inc/M4OSA_Time.h
63754a7bdb7b8ed1071a7c67766ab1f5e381728d	22-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	VideoEditor:Issue:3431967: Memory leak in Export case Code cleanup Change-Id: I81be8ef4f3abead6a85db8b0a4b2a9c594b1bcac ss/src/M4xVSS_internal.c
7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1	18-Feb-2011	Santosh Madhava <smadhava@google.com>	Merge "Fix for issue 3439595 : Movie studio playback previous frames"
b2d6e0f74a12e5cce5b429e646172c63346346c3	17-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3439595 : Movie studio playback previous frames Change-Id: I0f1a6cdfa40f6c8eebe989116e01ba8c212d5872 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
f84f29a3b43d903989f10288bfd3934d446228b3	18-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	Merge "VideoEditor: Issue ID:3431967 : MemLeak with Invalid input"
ac9dde5945fd00a6fb882bd171ee8a42a091fb86	17-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed issue 3421896 Slide transition causes images to jump in exported movie playback Change-Id: I78cbe7e3509f65ce651de926267fad4f65c3c263 ss/inc/M4VSS3GPP_InternalTypes.h ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c
b6c571382ade0561e95e63fef484f53971dc8c60	17-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	VideoEditor: Issue ID:3431967 : MemLeak with Invalid input Modified the fix after review Change-Id: Ic4dd92d76870256453a93b3a7d80e0d147884425 ss/mcs/src/M4MCS_API.c
8b95de2c4d57a0a07d7f4c59f2ddd52a140a361e	17-Feb-2011	Rajneesh Chowdury <rajneeshc@google.com>	Fix for issue 3456480 A/V not in sync when a picture is added followed by a video clip trimmed from start Change-Id: I7a46f7fc20de9a6c0ebbc2ad03dca898306bad6b vpp/PreviewPlayer.cpp
d9839024c67add85cf8300713ad1c6367e1a214c	16-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fix issue 3457629 FIle loads but does not play"
f21b91e7e6ba0de65a64b556224e7985113eeb67	16-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fix issue 3457629 FIle loads but does not play Change-Id: Id4f77d3883b0f6ad6ffd75ddac49efd5cf2ca1c7 ss/src/M4VD_EXTERNAL_BitstreamParser.c
c3e1e1e4207a655bf5a3ecf9b9e41700e54a3c86	16-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fixed issue 3443078 overlay flicker on transition in exported video"
f58e4c332ecf8c0cd6037b010256d0b4c56e6a17	16-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed issue 3443078 overlay flicker on transition in exported video Change-Id: I4c625a1f7c9897ee0d9aee3f521974456c97ad8c ss/inc/M4VSS3GPP_InternalTypes.h ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_internal.c
a5a42c5ceb98942909d84b20d44a920eed85a8cf	16-Feb-2011	Andreas Huber <andih@google.com>	Update this copy of our internal sources to reflect changes to the original... Change-Id: I6f66c1f4e73f0a83faf0fbcdea5073e6b9fef1de vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h
c083500e41973256e0c3d4faf5948916b64e918e	16-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fixed issue 3443078 overlay flicker on transition in exported video"
a5589b915ccc72a57ce7be8831fc99ec80be424f	14-Feb-2011	Santosh Madhava <smadhava@google.com>	Merge "Fix for issue 3431967 : Memory leak from video editor engine"
4ca3e5df4b809210b240cd7d0489922017d87a6d	12-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3431967 : Memory leak from video editor engine Cleanup Change-Id: Ie5432de17c30dbb02c70a759502b7f2e2dbba447 vpp/PreviewPlayer.cpp
10622437ecb8270ecaae43005ec9f141efd5c7ef	14-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fix for 3431967 Memory leak in SF shells"
2fffed1d281c5d9df2d5b830dca92034271362a2	14-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fix for 3431967 Memory leak in SF shells Change-Id: Iaecf24e7cc095c5295a1568b4185e977f19f15aa ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
0e248c82803c7880a15ce29c2d4be5c2189e414c	14-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed issue 3443078 overlay flicker on transition in exported video Change-Id: I0376b09acd91be8ba792478323d9f48a71818c2b ss/mcs/src/M4MCS_API.c ss/src/M4VSS3GPP_Clip.c
a14f40684961771d656ff88cce7c2b758511e92f	14-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fixed issue 3385135: change min audio buffer count to match awesome player"
5bc7fb407ce1bab13d4a4a67d34a1a3192ee3186	14-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue : 3450195 Adapt to the recent changes of awesome player in video editor preview player Change-Id: Ibd15264837dab32464fb90e75cf6d3d323cbbae3 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorAudioPlayer.cpp
d196f1c368746d13c3a7dc470ebe3a4c33d2c74d	12-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed issue 3385135: change min audio buffer count to match awesome player Change-Id: I4408b5c42edd0a65016ed621b31ecda513d17d60 vpp/VideoEditorPlayer.cpp
1845894d33736c8e17df6b88874bbd4e5a73977a	12-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fix for 3448630 H.263 files returning unsupported profile and level."
b864ee128119ad995862355776599e553691e722	12-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fix for 3448630 H.263 files returning unsupported profile and level. Change-Id: I9b65cd902fc575db2bc529d4349198d83d421854 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
6f01a99c470d4dcdc046b9ba802b787b95e38dbb	12-Feb-2011	Basavapatna Dattaguru <dattaguru@google.com>	VideoEditor: Fix for Issue 3419090 Change-Id: Id0dd34bbe9bb530e44bcdba6933bd6b2d9a7795c ss/common/inc/M4_VideoEditingCommon.h
ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6	11-Feb-2011	Santosh Madhava <smadhava@google.com>	Merge "Fix for issue 3431967 : Memory leak from video editor engine"
c32d4c16e4d356d50f72cf687f097ed042bbfb1e	11-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "Fix for issue : 3439708 Last frame is missing effect"
5df818550a13d5bd21798badcb413e7a945e15e8	11-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3431967 : Memory leak from video editor engine Change-Id: I4cc445ce7d41a4842dcf0b5ad1c729c0ae5553cd vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorBGAudioProcessing.h
5d5aed9d4e28fc2166617e54a219506fe0892e8b	11-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3444969 : Crash while generating transition Change-Id: I63286dc66bfcd496aee45d26c8934f519ce63429 ss/src/VideoEditorResampler.cpp
4f4efef8357f4d8b23ccfb1b29db34175bf72627	11-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue : 3439708 Last frame is missing effect Change-Id: I533695f4154d4ebce4e8f1ff39a622ca4fd62430 vpp/PreviewPlayer.cpp vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
b4ce81da6664b5029406a78be71c39af055a4d29	10-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3431967 : Memory leak from video editor engine Change-Id: I36e1cae53c91217804bc8243d9eb47820fb2114e vpp/VideoEditorPreviewController.cpp ss/src/VideoEditorResampler.cpp
9785cdf83214ce4d998e65ac0fce92cea3137f0b	09-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3431967 : Movie Studio crashed after pressing the back button Change-Id: I4b8cb2a54c2a1b7117feae9d8c6ca14e81b1f83d vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h vpp/VideoEditorTools.cpp
1ea8583c990170b94cdca0f9a248d61961c3520f	09-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue: 3437071 Crash during rendering mode change for specific video size Change-Id: I358c7cc24a7f8c71b953cf5179902fa20fbd727c vpp/VideoEditorTools.cpp ss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
9f3d387e580359562972479bb8788eef27cd0a55	08-Feb-2011	Kenny Root <kroot@google.com>	Merge "X86 target fixes"
9e4c36a044e264c644d7fa9f9894659a6fc47a6f	08-Feb-2011	Andreas Huber <andih@google.com>	This copy of our internal code does not handle seek-preview while paused well. disabling that functionality. Change-Id: Ie1d2bda6866e3754fb6237ab827c3c93a38104d8 related-to-bug: 3427268 vpp/PreviewPlayer.cpp
eb5b265274bb26732ac9f4ac2d42d0b7e4148d52	08-Feb-2011	Kenny Root <kroot@google.com>	X86 target fixes GCC 4.2.1 complains about using void* in arithmetic. Cast it to unsigned int before using it. Also there was a missing stdint.h include. Change-Id: If78bb6a771b72eb08bd2dc401371e8da14fd9ecc vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h
aa05e8c760d5c2b228cbc1a0aeacbf058ae40978	05-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed Issue 3423072: Imported 1080x720 video clips present distorted view in preview Change-Id: I38f2a042d66f7b639510d503321296e915689f7a vpp/VideoEditorTools.cpp ss/mcs/inc/M4MCS_ErrorCodes.h
4e28768b7a8d6a376c95d35e9060603431636bda	04-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
67fda6a6a718fa46aa803afa2c48be007b193587	04-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed 3419090 Throwing exception for unsupported video codec profiles and level Change-Id: Icc6fa16e1aed5eef4eb7908a8657b940290668e4 ss/inc/M4VSS3GPP_ErrorCodes.h ss/src/M4VSS3GPP_ClipAnalysis.c
5eae88ab5c94efee602a5b68ceacd74f5285c6c4	04-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fixed 3423072 Imported 1080x720 video clips present distorted view Change-Id: I4e6fb6e803dcb29afeb7cd82967c63479c40b329 ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
7e08031d59c6be5338d34f9fc55bfba1548525f4	04-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "Modification for using Software decoder for thumbnail generation" into honeycomb
b828db5197c34be4ae00a7d37f5c21caa51b8cbe	04-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Modification for using Software decoder for thumbnail generation Change-Id: I6f910292796917ad5aca5054a3522fb197df7826 ss/stagefrightshells/inc/VideoEditorVideoDecoder.h ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
bfece17c8f63de4d4b686da50f8ecac2f6f8ec53	04-Feb-2011	Santosh Madhava <smadhava@google.com>	Fix for 3409334 Movie Studio "Force Close" after importing a 3gp video Change-Id: I37949140a6c37a0c2d04221e220e7e267b6c7a02 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorPreviewController.cpp
12db816fa13a3963183e45e397954a32418c3ee3	04-Feb-2011	Danny Fernandes <dannyfernandes@google.com>	Fix for issue 3422485: Kenburn not showing continuous progress bar Change-Id: I19688a89fec1edeae2af1c9a8185b96a5fde2974 ss/src/M4xVSS_API.c
4f155f0cffa2414545854e899dff4861187e1f68	02-Feb-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix Issue Crash during Export Issue 3414805 , and Preview smoothning for 720p Clips Change-Id: I5a90fc350a33c1eca9b4ec682b68b80913578341 vpp/PreviewPlayer.cpp vpp/PreviewRenderer.cpp vpp/VideoEditorTools.cpp ss/src/M4xVSS_internal.c
aae29543bd55d383285a103e37e86afd18068fcd	02-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue: 3404624 The overlay in the exported video is blurry Change-Id: Ia24eeec5d22b1f9bc911260292e8e481830f2493 ss/src/M4VSS3GPP_EditVideo.c
c5bee355f86d921009ef7743bb9c5f43cf855053	01-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "Fix for issue 3410180: Small green lines at end of surface after removing last media item" into honeycomb
f892b561f5e6e54ceb2ddce3915b8bccfca24056	01-Feb-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue 3410180: Small green lines at end of surface after removing last media item Change-Id: I49695d5d77709da66ffa44d648b35e194f069a7f vpp/VideoEditorPreviewController.cpp
bb337b471658b7c2264c6ff1bb613739db851baa	31-Jan-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3404624 - The overlay in exported video is blurry Change-Id: I52bd474c85589bd75e58c675045a7c7fe058a228 ss/inc/M4VSS3GPP_InternalTypes.h ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4xVSS_API.c
5d33cc161e7d13459b4833dbc8b769093c3f80b0	30-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Incorporated review comments and merged on TOT Change-Id: Ia147aeb73a6d8cf9c48e02ccaa428aa7adc04d3a sal/src/M4OSA_FileCommon.c ss/inc/M4xVSS_Internal.h ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
e1f105895f913b19ad848cc90a3cd57dad657abf	30-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge the same files on top of tree. Add support for .m4v Issue 3395600 Change-Id: Ica9efce7ee3b550b2c49251c97a0663d490ffd73 ss/common/inc/M4_VideoEditingCommon.h ss/mcs/src/M4MCS_Codecs.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
29bf069483c8e2114bb925f95528a0e8ad11f432	31-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "Fix issue 3369917 :Audio skips at clip edit points" into honeycomb
2e7f31d481497ce59508b00e76cc79aebd107076	30-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Fix for issue 3400229 Pan and Zoom effect is not accurate in core Change-Id: I14e79bc5b75772df5095dc96bef2fabfa6763af1 ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c
53c567c3355255ed12dd9f5d5a1c58f821770329	30-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix issue 3369917 :Audio skips at clip edit points Change-Id: Ibfdcf7511efe054cd41bc36690696c6eddd2e500 vpp/DummyVideoSource.cpp vpp/PreviewPlayer.cpp vpp/VideoEditorPreviewController.cpp
8a838ad9f3b1568fce1606fd4b33a7b705064839	29-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning." into honeycomb
254c8dfe514fd45eef251763639f63615379570f	29-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning. Change-Id: Iec0fcea164f6909283c8686605378c3e1db127f0 vpp/PreviewPlayer.cpp
7f0ce8d629b731705341942f1308b91cba9ea29c	29-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Crash in prepare player. Issue No 3403342 Avoid race in preparing the same player twice. Change-Id: I5a735e54b94cd0dd435a066a92b1353e761eafc6 vpp/VideoEditorPreviewController.cpp
eab39fb973444f2c03b0e92d4df263b83c31f71b	28-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Merging on top of new sync VideoEditor:Fix for issue 3378727 Change-Id: Iff7d13689b436cda2b2073625a786322945b3edc vpp/VideoEditorPreviewController.cpp ss/stagefrightshells/src/VideoEditorMp3Reader.cpp
78554cc3ef73938202f79a9fd3c86b109d2d73f1	28-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "Fix Issue no 3374842. Preview Optimization while switching between two clips." into honeycomb
0078736220b9372f2c82eb258ceca3dbd6c358ef	27-Jan-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3370007 Overlay transparency is missing Change-Id: I1b513b607f669d141bcd28bd918b8c1319bef7fa ss/src/M4xVSS_internal.c ss/video_filters/src/Android.mk ss/video_filters/src/M4VIFI_RGB565toYUV420.c ss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
3c48e4126582f6d9d4c74868d81d868f47bac3eb	28-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix Issue no 3374842. Preview Optimization while switching between two clips. Change-Id: Iefb55107965b3978f83794fe727405206afdde72 vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
342f932f6312be84a48512216b561ead42b53199	28-Jan-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3399126 Overlay displayed over next clip Change-Id: If2baf25bfe10cd4034db827c0333b3020bbd3087 vpp/PreviewPlayer.cpp
ab639fac88f5513587be5bbaab3dd7d3b68e7e53	27-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "VideoEditor:Fix for 3384150 and 3369908" into honeycomb
ec380153defefa617d1f83e2910fd9e58a641c12	27-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	VideoEditor:Fix for 3384150 and 3369908 Change-Id: I3ea2983d8df263dcbd0b4c55a81f06cdea4ff568 ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
52897c2fda8d1d97796af1477c2748e3a2f25436	27-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fixed the SRC interface bug - 3369860 Change-Id: I6b866d334af9c9aea1db0295bf19edbc4123293d ss/common/inc/VideoEditorResampler.h ss/mcs/src/M4MCS_API.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/VideoEditorResampler.cpp
d01ef568f96253fe5859526bb67b13fc5e17b544	27-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix Issues 3395836 Change-Id: I4cf83c99d09b27c92a7789a4c16b2e237011a7fd vpp/PreviewPlayer.cpp vpp/VideoEditorPreviewController.cpp
e6c0750cd2927967f93a8811954f889d23fadb6e	22-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix for ISSUE 3370836 - Overlay optmization. Change-Id: I9c6657f6fdab0fa815201d8b26b8c90700663c12 vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
2177d443f2d57b9d3045d535d8f2b186e5b76f25	26-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "VideEditor:Fix for 3369908 Removed redundant code." into honeycomb
9ce06f4caa9e106b868ef9030e758c3e2a546e6c	26-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	Merge "VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame" into honeycomb
5e61cfe5bb05d061ee4ef951b43156e68ff710af	26-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame Change-Id: I18f82dcf819ba5df67f65d1705cda57b4a73c71d ss/common/inc/M4SYS_AccessUnit.h ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
733100524deb5d2da77ac52a2ff89b2cde242934	26-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	VideoEditor: Fix for issue 3387848 and 3375632 Change-Id: I146deb70e6c494f60bea3e3380c6a80320b5ccf0 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
9ec356a232336f80a048c71554ce79474ae1a784	25-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	VideoEditor:Fix for Clear Surface API Bug of not able to create empty project bug - 3370622 Change-Id: Icb18b3d8afbdb077a93dc5e599ccc20da64703f2 vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h
1526a3385d36d6e1953c932410548bf9631a0eb3	23-Jan-2011	Dheeraj Sharma <dheerajs@google.com>	VideEditor:Fix for 3369908 Removed redundant code. Change-Id: Ia0789f5c6205ad2fc793921bb967bd9ec76e2b9a ss/common/inc/VideoEditorResampler.h ss/common/inc/gLVAudioResampler.h ss/mcs/src/M4MCS_API.c ss/src/Android.mk ss/src/M4VSS3GPP_AudioMixing.c ss/src/VideoEditorResampler.cpp ss/src/glvaudioresampler.c
d6dbc5850ca49d7c8b3bc8a6802fa7c85c5b1613	23-Jan-2011	Basavapatna Dattaguru <dattaguru@google.com>	VideoEditor: Modified to fill FPS information Change-Id: Ief53ecdfdd9e32e980592f0513ba92993d655d0b ss/stagefrightshells/src/VideoEditor3gpReader.cpp
3ad01762633531957174c5b27e71ca4aac45e554	21-Jan-2011	Santosh Madhava <smadhava@google.com>	Fix for issue 3372755 : File descriptor leak Change-Id: Ib1471078dbbcb595422fd481e5a3368e79e39e19 vpp/VideoEditorSRC.cpp ss/stagefrightshells/src/VideoEditor3gpReader.cpp
ed95045a6936b92f46166d85baa1b00c41a9af94	20-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "Fix 3367037 Transition are of low Quality" into honeycomb
2909d435a1b3c68f65b1deca628c1a6b58d7ffdb	20-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "Change preview player code also." into honeycomb
c6a88ac5d620a5cd47b2741a915d661aab8fe0b4	20-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix 3367037 Transition are of low Quality Change-Id: I511546aef895edbfed16fc855bada93486dd886a ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditVideo.c
35cb2de64cb6482a08f446e80733e7d344a0dcac	20-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Change preview player code also. Adapt to 32 bit aligned decoder buffers Change-Id: I631f7e60b8e424af496f45d0e5e292bf9e8a9dde vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
7215b678d1e8f85a235d8d284c22be3da134a2c4	19-Jan-2011	Basavapatna Dattaguru <dattaguru@google.com>	Merge "Video Editor: Fix for seek in exported clip" into honeycomb
bf3270869c4734e6b628d0a0dbd46015f622ea4a	19-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Remove the eng developement LOCALtags in makefiles Change-Id: I6da8691dba062cd54410ffafde27b7eca0b73aa2 vpp/Android.mk sal/src/Android.mk ss/3gpwriter/src/Android.mk ss/mcs/src/Android.mk ss/src/Android.mk ss/stagefrightshells/src/Android.mk ss/video_filters/src/Android.mk
13ecfb62545e521f807239864dc74ca1c295e3fa	19-Jan-2011	Basavapatna Dattaguru <dattaguru@google.com>	Video Editor: Fix for seek in exported clip Change-Id: I5f519a9a987b3bfbff7ab9e6057a8a94be527982 ss/stagefrightshells/src/VideoEditor3gpReader.cpp
cd6155846aa6f61ba9d958843a134656596ac0e7	18-Jan-2011	James Dong <jdong@google.com>	Merge "Fix git_master-without-vendor build" into honeycomb
ba119eb166c9c06060c3d05b23202402287d7566	18-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Fix git_master-without-vendor build Change-Id: Ia1ceb9d2d11725950c1cdc3215661830842c51fb vpp/Android.mk ss/stagefrightshells/src/Android.mk
945956bb7126e483c3bcf7583c9f7acaae952830	18-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	videoeditor osal files check in on honeycomb Change-Id: Ibb1f20329fbc6bb1629f5d6d4588eb6966f1c1ab sal/src/M4OSA_FileCommon.c
524effb5b841da901a141160480a6b00d1d9861f	17-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "videoeditor osal files check in on honeycomb" into honeycomb
9bbde4c405b538677ae2892ec5104f74d8a19ec6	17-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Merge "videoeditor preview code on honeycomb" into honeycomb
7c9d8018755adf1857571125ba1b3598c96ea506	17-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	Removed unwanted line in M4READER_Amr.h vss core files upload on honeycomb Change-Id: I61206ae2398ce8ac544c6fb01a76fe8917bce75b ndroid.mk ss/3gpwriter/Android.mk ss/3gpwriter/inc/M4MP4W_Types.h ss/3gpwriter/inc/M4MP4W_Utils.h ss/3gpwriter/inc/M4MP4W_Writer.h ss/3gpwriter/src/Android.mk ss/3gpwriter/src/M4MP4W_Interface.c ss/3gpwriter/src/M4MP4W_Utils.c ss/3gpwriter/src/M4MP4W_Writer.c ss/Android.mk ss/common/inc/From2iToMono_16.h ss/common/inc/LVM_Types.h ss/common/inc/M4AD_Common.h ss/common/inc/M4AD_Null.h ss/common/inc/M4AIR_API.h ss/common/inc/M4AMRR_CoreReader.h ss/common/inc/M4CLOCK.h ss/common/inc/M4Common_types.h ss/common/inc/M4DA_Types.h ss/common/inc/M4DECODER_Common.h ss/common/inc/M4ENCODER_AudioCommon.h ss/common/inc/M4ENCODER_common.h ss/common/inc/M4MDP_API.h ss/common/inc/M4OSA_CoreID.h ss/common/inc/M4PCMR_CoreReader.h ss/common/inc/M4READER_3gpCom.h ss/common/inc/M4READER_Amr.h ss/common/inc/M4READER_Common.h ss/common/inc/M4READER_Pcm.h ss/common/inc/M4SYS_AccessUnit.h ss/common/inc/M4SYS_Stream.h ss/common/inc/M4TOOL_VersionInfo.h ss/common/inc/M4VD_EXTERNAL_Interface.h ss/common/inc/M4VD_EXTERNAL_Internal.h ss/common/inc/M4VD_HW_API.h ss/common/inc/M4VD_Tools.h ss/common/inc/M4VE_API.h ss/common/inc/M4VFL_transition.h ss/common/inc/M4VIFI_Clip.h ss/common/inc/M4VIFI_Defines.h ss/common/inc/M4VIFI_FiltersAPI.h ss/common/inc/M4VPP_API.h ss/common/inc/M4WRITER_common.h ss/common/inc/M4_BitStreamParser.h ss/common/inc/M4_Common.h ss/common/inc/M4_Logo.h ss/common/inc/M4_Utils.h ss/common/inc/M4_VideoEditingCommon.h ss/common/inc/MonoTo2I_16.h ss/common/inc/NXPSW_CompilerSwitches.h ss/common/inc/NXPSW_CompilerSwitches_MCS.h ss/common/inc/SSRC.h ss/common/inc/gLVAudioResampler.h ss/common/inc/marker.h ss/inc/M4EXIFC_CommonAPI.h ss/inc/M4PTO3GPP_API.h ss/inc/M4PTO3GPP_ErrorCodes.h ss/inc/M4PTO3GPP_InternalTypes.h ss/inc/M4VSS3GPP_API.h ss/inc/M4VSS3GPP_ErrorCodes.h ss/inc/M4VSS3GPP_Extended_API.h ss/inc/M4VSS3GPP_InternalConfig.h ss/inc/M4VSS3GPP_InternalFunctions.h ss/inc/M4VSS3GPP_InternalTypes.h ss/inc/M4xVSS_API.h ss/inc/M4xVSS_Internal.h ss/mcs/Android.mk ss/mcs/inc/M4MCS_API.h ss/mcs/inc/M4MCS_ErrorCodes.h ss/mcs/inc/M4MCS_InternalConfig.h ss/mcs/inc/M4MCS_InternalFunctions.h ss/mcs/inc/M4MCS_InternalTypes.h ss/mcs/src/Android.mk ss/mcs/src/M4MCS_API.c ss/mcs/src/M4MCS_AudioEffects.c ss/mcs/src/M4MCS_BitstreamParser.c ss/mcs/src/M4MCS_Codecs.c ss/mcs/src/M4MCS_MediaAndCodecSubscription.c ss/mcs/src/M4MCS_VideoPreProcessing.c ss/src/Android.mk ss/src/M4AD_Null.c ss/src/M4AIR_API.c ss/src/M4AMRR_CoreReader.c ss/src/M4ChannelCoverter.c ss/src/M4PCMR_CoreReader.c ss/src/M4PTO3GPP_API.c ss/src/M4PTO3GPP_VideoPreProcessing.c ss/src/M4READER_Amr.c ss/src/M4READER_Pcm.c ss/src/M4VD_EXTERNAL_BitstreamParser.c ss/src/M4VD_EXTERNAL_Interface.c ss/src/M4VD_Tools.c ss/src/M4VIFI_xVSS_RGB565toYUV420.c ss/src/M4VSS3GPP_AudioMixing.c ss/src/M4VSS3GPP_Clip.c ss/src/M4VSS3GPP_ClipAnalysis.c ss/src/M4VSS3GPP_Codecs.c ss/src/M4VSS3GPP_Edit.c ss/src/M4VSS3GPP_EditAudio.c ss/src/M4VSS3GPP_EditVideo.c ss/src/M4VSS3GPP_MediaAndCodecSubscription.c ss/src/M4xVSS_API.c ss/src/M4xVSS_internal.c ss/src/glvaudioresampler.c ss/stagefrightshells/Android.mk ss/stagefrightshells/inc/VideoEditor3gpReader.h ss/stagefrightshells/inc/VideoEditorAudioDecoder.h ss/stagefrightshells/inc/VideoEditorAudioEncoder.h ss/stagefrightshells/inc/VideoEditorBuffer.h ss/stagefrightshells/inc/VideoEditorMp3Reader.h ss/stagefrightshells/inc/VideoEditorUtils.h ss/stagefrightshells/inc/VideoEditorVideoDecoder.h ss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h ss/stagefrightshells/inc/VideoEditorVideoEncoder.h ss/stagefrightshells/src/Android.mk ss/stagefrightshells/src/VideoEditor3gpReader.cpp ss/stagefrightshells/src/VideoEditorAudioDecoder.cpp ss/stagefrightshells/src/VideoEditorAudioEncoder.cpp ss/stagefrightshells/src/VideoEditorBuffer.c ss/stagefrightshells/src/VideoEditorMp3Reader.cpp ss/stagefrightshells/src/VideoEditorUtils.cpp ss/stagefrightshells/src/VideoEditorVideoDecoder.cpp ss/stagefrightshells/src/VideoEditorVideoEncoder.cpp ss/video_filters/Android.mk ss/video_filters/src/Android.mk ss/video_filters/src/M4VFL_transition.c ss/video_filters/src/M4VIFI_BGR565toYUV420.c ss/video_filters/src/M4VIFI_Clip.c ss/video_filters/src/M4VIFI_RGB888toYUV420.c ss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c ss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c ss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
643290dc4c83da23b1b8ff4ed71118203274bb15	17-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	videoeditor preview code on honeycomb Change-Id: I9c3c9cb921ea697ab16732973d26ef9035cda2ee vpp/Android.mk vpp/DummyAudioSource.cpp vpp/DummyAudioSource.h vpp/DummyVideoSource.cpp vpp/DummyVideoSource.h vpp/PreviewPlayer.cpp vpp/PreviewPlayer.h vpp/PreviewRenderer.cpp vpp/PreviewRenderer.h vpp/VideoEditorAudioPlayer.cpp vpp/VideoEditorAudioPlayer.h vpp/VideoEditorBGAudioProcessing.cpp vpp/VideoEditorBGAudioProcessing.h vpp/VideoEditorPlayer.cpp vpp/VideoEditorPlayer.h vpp/VideoEditorPreviewController.cpp vpp/VideoEditorPreviewController.h vpp/VideoEditorSRC.cpp vpp/VideoEditorSRC.h vpp/VideoEditorTools.cpp vpp/VideoEditorTools.h
855ec7c4be7ad642721909d5837a8d25a117c22f	17-Jan-2011	Dharmaray Kundargi <dharmaray@google.com>	videoeditor osal files check in on honeycomb Change-Id: Id6c5f9f8819158ebffa9fd4dbbf5979a0e5f5808 sal/Android.mk sal/inc/LVOSA_FileReader_optim.h sal/inc/LV_Macros.h sal/inc/LV_Types.h sal/inc/M4OSA_CharStar.h sal/inc/M4OSA_Clock.h sal/inc/M4OSA_CoreID.h sal/inc/M4OSA_Debug.h sal/inc/M4OSA_Error.h sal/inc/M4OSA_Export.h sal/inc/M4OSA_FileAccess.h sal/inc/M4OSA_FileCache.h sal/inc/M4OSA_FileCommon.h sal/inc/M4OSA_FileCommon_priv.h sal/inc/M4OSA_FileExtra.h sal/inc/M4OSA_FileReader.h sal/inc/M4OSA_FileReaderRam.h sal/inc/M4OSA_FileReader_priv.h sal/inc/M4OSA_FileWriter.h sal/inc/M4OSA_FileWriterRam.h sal/inc/M4OSA_FileWriter_priv.h sal/inc/M4OSA_Memory.h sal/inc/M4OSA_Mutex.h sal/inc/M4OSA_OptionID.h sal/inc/M4OSA_Semaphore.h sal/inc/M4OSA_String.h sal/inc/M4OSA_String_priv.h sal/inc/M4OSA_Thread.h sal/inc/M4OSA_Thread_priv.h sal/inc/M4OSA_Time.h sal/inc/M4OSA_Types.h sal/src/Android.mk sal/src/LVOSA_FileReader_optim.c sal/src/M4OSA_CharStar.c sal/src/M4OSA_Clock.c sal/src/M4OSA_FileCache.c sal/src/M4OSA_FileCommon.c sal/src/M4OSA_FileExtra.c sal/src/M4OSA_FileReader.c sal/src/M4OSA_FileReader_RAM.c sal/src/M4OSA_FileWriter.c sal/src/M4OSA_FileWriter_RAM.c sal/src/M4OSA_Mutex.c sal/src/M4OSA_Random.c sal/src/M4OSA_Semaphore.c sal/src/M4OSA_String.c sal/src/M4OSA_String_priv.c sal/src/M4OSA_Thread.c sal/src/M4PSW_DebugTrace.c sal/src/M4PSW_MemoryInterface.c sal/src/M4PSW_Trace.c