OSDN Git Service
Glenn Kasten [Tue, 13 Mar 2012 22:12:33 +0000 (15:12 -0700)]
Add libmedia_native
Change-Id: I4bff781a26d01023d23d5285a8aa83dbce46c629
Glenn Kasten [Tue, 13 Mar 2012 22:22:11 +0000 (15:22 -0700)]
Fix LOCAL_C_INCLUDES and correct #include syntax
Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
Glenn Kasten [Tue, 13 Mar 2012 22:12:49 +0000 (15:12 -0700)]
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
James Dong [Mon, 12 Mar 2012 21:51:50 +0000 (14:51 -0700)]
Switched to use header files in /frameworks/native
o related-to-bug:
6044887
Change-Id: I3a1143b09560a6b8fd67d23bbb375c83442a12e9
James Dong [Mon, 12 Mar 2012 18:34:40 +0000 (11:34 -0700)]
Swtched to use header file in /frameworks/native
o related-to-bug:
6044894
Change-Id: I192f0436572d240fd2fb88446f6fa63ba0128d7e
James Dong [Mon, 12 Mar 2012 17:24:41 +0000 (10:24 -0700)]
Merge "Refactored MediaBufferPuller class from VideoEditorVideoEncoder class"
Jean-Michel Trivi [Sun, 11 Mar 2012 22:47:55 +0000 (15:47 -0700)]
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
Glenn Kasten [Wed, 7 Mar 2012 02:55:35 +0000 (18:55 -0800)]
Use audio_policy_output_flags_t consistently
Change-Id: I425cfd442257560dcf141d3d8599ddc7d21c1d13
James Dong [Tue, 6 Mar 2012 18:59:23 +0000 (10:59 -0800)]
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
Jean-Michel Trivi [Fri, 2 Mar 2012 22:34:10 +0000 (14:34 -0800)]
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
Mathias Agopian [Sun, 26 Feb 2012 08:40:08 +0000 (00:40 -0800)]
fix location of libgui headers
Change-Id: I0d203f4e7aa83e0449f7ebb9f3cafe021e38fc2f
Mathias Agopian [Sat, 25 Feb 2012 01:21:43 +0000 (17:21 -0800)]
remove dependency on android_native_buffer.h
Change-Id: I720d5e6ac7e4455d7ab59eab7e9c2478b911228a
John Grossman [Fri, 10 Feb 2012 21:46:24 +0000 (13:46 -0800)]
Update method sigs.
Update the getNextBuffer signatures to have an additional (but
ignorable) parameter used to implement timed audio output.
Change-Id: Icb98e4af4d136c234ae8c5cbb4a5de4350b436bb
James Dong [Fri, 10 Feb 2012 07:54:07 +0000 (23:54 -0800)]
Merge "Move away from MediaDebug and use ADebug instead"
James Dong [Fri, 10 Feb 2012 00:32:42 +0000 (16:32 -0800)]
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
James Dong [Wed, 8 Feb 2012 21:51:46 +0000 (13:51 -0800)]
Move away from MediaDebug and use ADebug instead
Change-Id: I307b3f565808ec8e3b9a4d944c6c0d1f603b04c9
James Dong [Sun, 5 Feb 2012 18:21:00 +0000 (10:21 -0800)]
Removed unnecessary memset before an immediate memcpy
Change-Id: I447057f861bb6b7977de48a598fd5bed7e75460b
James Dong [Fri, 3 Feb 2012 19:09:48 +0000 (11:09 -0800)]
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
James Dong [Wed, 1 Feb 2012 21:38:19 +0000 (13:38 -0800)]
Merge "Clean up VideoEditorPreviewController class part one:"
The Android Open Source Project [Wed, 1 Feb 2012 18:05:52 +0000 (10:05 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:11 +0000 (10:01 -0800)]
am
a91c3232: Reconcile with ics-mr1-release
* commit '
a91c3232fcfe908ddb65be33bdeedff344dfc7d8':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:21 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5553166d3df57d850f576995d0cb5e162e4eccee
James Dong [Sat, 28 Jan 2012 03:01:13 +0000 (19:01 -0800)]
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
James Dong [Mon, 30 Jan 2012 19:51:54 +0000 (11:51 -0800)]
Merge "Fix an error to deal with 0-size nal units in some AVC files"
James Dong [Fri, 27 Jan 2012 23:38:44 +0000 (15:38 -0800)]
Fix an error to deal with 0-size nal units in some AVC files
o related-to-bug:
5890998
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
James Dong [Sat, 21 Jan 2012 03:28:01 +0000 (19:28 -0800)]
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
James Dong [Tue, 24 Jan 2012 03:03:59 +0000 (19:03 -0800)]
Merge "AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect."
James Dong [Mon, 23 Jan 2012 23:39:19 +0000 (15:39 -0800)]
Fix an error that missed an "=" for equality in an if statement
Change-Id: Ib566226b427f5357d52c7b9c0742afa05fdd3a84
James Dong [Fri, 20 Jan 2012 21:09:13 +0000 (13:09 -0800)]
AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect.
o this patch removed the AudioPlayerBase class.
o verified and passed functional tests
Change-Id: I33727069ef63136979b954a9dee1c35309ef6dd4
James Dong [Fri, 20 Jan 2012 17:33:29 +0000 (09:33 -0800)]
Merge "More source code Clean up in video editor engine"
James Dong [Fri, 20 Jan 2012 02:40:59 +0000 (18:40 -0800)]
Don't allow evil constructors in VideoEditorBGAudioProcessing
Change-Id: Ic525ed66308681ec62363bc90ed2cea42c165a2b
James Dong [Sat, 14 Jan 2012 01:34:42 +0000 (17:34 -0800)]
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
James Dong [Tue, 17 Jan 2012 22:23:29 +0000 (14:23 -0800)]
Fix two typos in the defined frequency enums
Change-Id: Ia0b6af98bd8f2ccb4d79705064a225e5f699ed8d
Glenn Kasten [Tue, 17 Jan 2012 15:25:59 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"
Glenn Kasten [Mon, 9 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Use audio_stream_type_t consistently
Change-Id: I0b3ba8ab74f03433d1e64cb898fa62c02535a2f1
James Dong [Thu, 12 Jan 2012 20:12:40 +0000 (12:12 -0800)]
Remove streaming related logic from preview player.
Video editor engine only deals with local file playback/preview.
Change-Id: I8e3414abf8a109a77a1e34a959fb4a090612ae3d
related-to-bug:
5857057
Glenn Kasten [Wed, 4 Jan 2012 17:30:49 +0000 (09:30 -0800)]
Use audio_format_t consistently
Change-Id: Idb08c49fe1a2c87ea2bb080815a5a6f95409834c
James Dong [Thu, 12 Jan 2012 03:11:31 +0000 (19:11 -0800)]
Remove unnecessary drm handling logic in PreviewPlayerBase class
Change-Id: I08b1e23ecf5775deb92a262fb9ed60a464fe60c0
related-to-bug:
5857208
Steve Block [Sun, 8 Jan 2012 10:14:44 +0000 (10:14 +0000)]
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
Steve Block [Thu, 5 Jan 2012 23:22:50 +0000 (23:22 +0000)]
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
Steve Block [Wed, 4 Jan 2012 20:06:05 +0000 (20:06 +0000)]
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
Steve Block [Tue, 20 Dec 2011 16:24:14 +0000 (16:24 +0000)]
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
Glenn Kasten [Fri, 16 Dec 2011 22:58:14 +0000 (14:58 -0800)]
Merge "ditherAndClamp from libaudioutils not AudioMixer"
Glenn Kasten [Fri, 16 Dec 2011 19:07:44 +0000 (11:07 -0800)]
ditherAndClamp from libaudioutils not AudioMixer
Change-Id: I1e8a00c81efefd956fe9e4d9b58557373320e322
The Android Open Source Project [Fri, 9 Dec 2011 22:57:40 +0000 (14:57 -0800)]
am
576bb4a6: Reconcile with ics-mr1-release
* commit '
576bb4a63f925ef5862eedb6428ba890f0ad1054':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:02 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96
The Android Open Source Project [Mon, 5 Dec 2011 16:53:37 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I50ea08700096cc77b6af3838bb4adbc21062de1c
Hong Teng [Fri, 2 Dec 2011 21:44:09 +0000 (13:44 -0800)]
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.
The Android Automerger [Fri, 2 Dec 2011 18:25:17 +0000 (10:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Hong Teng [Thu, 1 Dec 2011 00:42:56 +0000 (16:42 -0800)]
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
The Android Open Source Project [Wed, 30 Nov 2011 20:56:01 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I49813a61d932c0d7b0562f8706292494c4c04e9b
The Android Automerger [Mon, 28 Nov 2011 20:22:30 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Hong Teng [Tue, 22 Nov 2011 17:40:15 +0000 (09:40 -0800)]
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
Hong Teng [Mon, 21 Nov 2011 23:09:49 +0000 (15:09 -0800)]
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
The Android Open Source Project [Fri, 18 Nov 2011 23:43:26 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I90ea8a02a4bb9b357d7bddfa1a02602d3de839fa
The Android Automerger [Wed, 16 Nov 2011 14:46:25 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Wed, 16 Nov 2011 03:39:05 +0000 (11:39 +0800)]
resolved conflicts for merge of
fbb122bf to master
Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963
Chih-Chung Chang [Wed, 16 Nov 2011 02:35:24 +0000 (18:35 -0800)]
Merge "Fix
5607624: Native crash in movie studio while previewing the movie" into ics-mr1
Hong Teng [Tue, 15 Nov 2011 21:07:05 +0000 (13:07 -0800)]
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.
Chih-Chung Chang [Tue, 15 Nov 2011 11:47:25 +0000 (19:47 +0800)]
Fix
5607624: Native crash in movie studio while previewing the movie
Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29
Hong Teng [Thu, 10 Nov 2011 23:01:09 +0000 (15:01 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to
limit the total memory usage.
Change-Id: I43c03fc626194d9ebbe8d914d9209a04bc085831
The Android Open Source Project [Mon, 31 Oct 2011 20:19:21 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release
Change-Id: I712537045ade8ec23936caddcdbf95fbba0ef9a8
Steve Block [Thu, 20 Oct 2011 10:56:09 +0000 (11:56 +0100)]
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug:
5449033
Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
The Android Automerger [Thu, 20 Oct 2011 14:00:50 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
James Dong [Thu, 20 Oct 2011 07:19:00 +0000 (00:19 -0700)]
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.
James Dong [Thu, 20 Oct 2011 07:17:28 +0000 (00:17 -0700)]
Merge "Fix for
5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
Hong Teng [Thu, 20 Oct 2011 06:10:56 +0000 (23:10 -0700)]
am
52da22e1: Fix for
5234840 Corrupted frames in transition
* commit '
52da22e185f4bd4c7778706d8651a2706cdffc5b':
Fix for
5234840 Corrupted frames in transition
Hong Teng [Wed, 19 Oct 2011 23:36:12 +0000 (16:36 -0700)]
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
Rajneesh Chowdury [Wed, 19 Oct 2011 19:49:08 +0000 (12:49 -0700)]
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
The Android Automerger [Wed, 19 Oct 2011 14:44:51 +0000 (07:44 -0700)]
merge in ics-release history after reset to master
Hong Teng [Wed, 19 Oct 2011 05:09:48 +0000 (22:09 -0700)]
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
Hong Teng [Thu, 13 Oct 2011 02:57:19 +0000 (19:57 -0700)]
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
The Android Automerger [Sun, 16 Oct 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Wed, 12 Oct 2011 22:08:42 +0000 (15:08 -0700)]
Remove RTSP support from libvideoeditor's PreviewPlayer...
Change-Id: I2032772037c1130736081cb62bd6ce8d1270e1b9
The Android Automerger [Thu, 6 Oct 2011 14:00:44 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Hong Teng [Thu, 6 Oct 2011 00:26:34 +0000 (17:26 -0700)]
Merge "Fix for
5369981 Native crash : testPreviewWithEndAudioTrack functional test."
Hong Teng [Thu, 29 Sep 2011 01:40:38 +0000 (18:40 -0700)]
Fix for
5369981 Native crash : testPreviewWithEndAudioTrack functional test.
Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e
The Android Automerger [Wed, 5 Oct 2011 13:58:58 +0000 (06:58 -0700)]
merge in ics-release history after reset to master
James Dong [Tue, 4 Oct 2011 02:40:19 +0000 (19:40 -0700)]
Video editor incorrectly rejects videos that could be supported by the HW decoder
Change-Id: I831b32c7ab02fa110865c88bbb02f339889d97a5
related-to-bug:
5407761
The Android Automerger [Tue, 27 Sep 2011 14:00:15 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Rajneesh Chowdury [Mon, 26 Sep 2011 16:30:04 +0000 (09:30 -0700)]
Merge "Fix for
5205420 compression domain trimming fallback mechanism"
The Android Automerger [Sun, 25 Sep 2011 14:00:22 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Rajneesh Chowdury [Fri, 23 Sep 2011 21:44:56 +0000 (14:44 -0700)]
am
996fb989: (-s ours) DO NOT MERGE. Fix for
5247764 profile and level settings are not always correctly set
* commit '
996fb989eb4cbe80c91cfe3ef4d32f349dffa72d':
DO NOT MERGE. Fix for
5247764 profile and level settings are not always correctly set
Rajneesh Chowdury [Thu, 22 Sep 2011 20:00:36 +0000 (13:00 -0700)]
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
Rajneesh Chowdury [Wed, 14 Sep 2011 18:08:05 +0000 (11:08 -0700)]
DO NOT MERGE. Fix for
5247764 profile and level settings are not always correctly set
Cherry picked from master.
Correct video bitrate value is set from 3gpReader node.
Also, bitrate is limited to max supported by encoder as
per profile and level.
This patch also fixes bug
5309520 [Prime] Native crash while running CTS test testExportEffectOverlay.
Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e
Rajneesh Chowdury [Thu, 22 Sep 2011 17:51:02 +0000 (10:51 -0700)]
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
The Android Automerger [Sun, 18 Sep 2011 14:00:26 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Rajneesh Chowdury [Fri, 16 Sep 2011 00:38:26 +0000 (17:38 -0700)]
am
2e200ef7: (-s ours) DO NOT MERGE - Fix for bug
5255159 Cannot play exported movie from Movie Studio
* commit '
2e200ef75541ee0f494877a42ae0e870799cc35c':
DO NOT MERGE - Fix for bug
5255159 Cannot play exported movie from Movie Studio
Rajneesh Chowdury [Thu, 15 Sep 2011 23:24:55 +0000 (16:24 -0700)]
DO NOT MERGE - Fix for bug
5255159 Cannot play exported movie from Movie Studio
Ensure video encoder is not created and destroyed for every clip.
Change-Id: I9ce4db9312af801570dd51f4b075f262e27e3952
Rajneesh Chowdury [Thu, 15 Sep 2011 17:03:21 +0000 (10:03 -0700)]
Merge "Fix for
5247764 profile and level settings are not always correctly set"
Rajneesh Chowdury [Wed, 14 Sep 2011 22:38:07 +0000 (15:38 -0700)]
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
Rajneesh Chowdury [Wed, 14 Sep 2011 18:08:05 +0000 (11:08 -0700)]
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
The Android Automerger [Wed, 14 Sep 2011 13:34:16 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Hong Teng [Mon, 12 Sep 2011 21:10:59 +0000 (14:10 -0700)]
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
The Android Automerger [Tue, 6 Sep 2011 13:33:58 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Mon, 5 Sep 2011 06:49:35 +0000 (14:49 +0800)]
Enable some logs to debug
5195693.
Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d
Chih-Chung Chang [Fri, 2 Sep 2011 08:10:12 +0000 (16:10 +0800)]
Fix
5240036: We didn't handle the 1920x1080 resolution.
Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc
The Android Automerger [Thu, 1 Sep 2011 13:33:59 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 20:42:48 +0000 (13:42 -0700)]
merge in ics-release history after reset to master
Rajneesh Chowdury [Tue, 30 Aug 2011 19:59:30 +0000 (12:59 -0700)]
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