diff options
| author | Hong Teng <hongteng@google.com> | 2011-10-19 23:10:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 23:10:56 -0700 |
| commit | ee0ef8b405dd308cae26ead9772e9aea5be6ac14 (patch) | |
| tree | 6906169a5d8ca98324d0e9f1f5d8eeb66b1afd07 /libvideoeditor | |
| parent | b3c06552b415b15ad568c41281f148706f7cbd9e (diff) | |
| parent | c65d276d201f85c2ea99e79ede7b5d2bc08d25fb (diff) | |
| download | frameworks_av-ee0ef8b405dd308cae26ead9772e9aea5be6ac14.zip frameworks_av-ee0ef8b405dd308cae26ead9772e9aea5be6ac14.tar.gz frameworks_av-ee0ef8b405dd308cae26ead9772e9aea5be6ac14.tar.bz2 | |
am 52da22e1: Fix for 5234840 Corrupted frames in transition
* commit '52da22e185f4bd4c7778706d8651a2706cdffc5b':
Fix for 5234840 Corrupted frames in transition
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_API.c | 9 |
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 = |