summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorHong Teng <hongteng@google.com>2011-10-19 16:36:12 -0700
committerHong Teng <hongteng@google.com>2011-10-19 16:56:03 -0700
commitc65d276d201f85c2ea99e79ede7b5d2bc08d25fb (patch)
tree2ca859cac0c807b1330837b21209297300818e59 /libvideoeditor
parenteac28ab858dc4ecdfd25b6d8851219e6787d1222 (diff)
downloadframeworks_av-c65d276d201f85c2ea99e79ede7b5d2bc08d25fb.zip
frameworks_av-c65d276d201f85c2ea99e79ede7b5d2bc08d25fb.tar.gz
frameworks_av-c65d276d201f85c2ea99e79ede7b5d2bc08d25fb.tar.bz2
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
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/vss/src/M4xVSS_API.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libvideoeditor/vss/src/M4xVSS_API.c b/libvideoeditor/vss/src/M4xVSS_API.c
index de69cd1..37b2e47 100755
--- a/libvideoeditor/vss/src/M4xVSS_API.c
+++ b/libvideoeditor/vss/src/M4xVSS_API.c
@@ -2432,12 +2432,15 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
}
}
/* Here check the clip video profile and level, if it exceeds
- * the profile and level of export file, then the file need
- * to be transcoded(do not do compress domain trim) */
+ * the profile and level of export file, then the file needs
+ * to be transcoded(do not do compress domain trim).
+ * Also for MPEG4 fomart, always do transcoding since HW encoder
+ * may use different time scale value than the input clip*/
if ((fileProperties.uiVideoProfile >
xVSS_context->pSettings->xVSS.outputVideoProfile) ||
(fileProperties.uiVideoLevel >
- xVSS_context->pSettings->xVSS.outputVideoLevel)) {
+ xVSS_context->pSettings->xVSS.outputVideoLevel) ||
+ (fileProperties.VideoStreamType == M4VIDEOEDITING_kMPEG4)) {
/* Set bTranscodingRequired to TRUE to indicate the video will be
* transcoded in MCS. */
xVSS_context->pSettings->pClipList[i]->bTranscodingRequired =