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 | 17887cd0623d1cc8f225505ecc5b5bec78e75b32 (patch) | |
| tree | 5dc33cbf57e7908662390998a574de058eac39ec | |
| parent | d41d94e217507ecf9217bebd950b83390e7ffaf6 (diff) | |
| parent | 52da22e185f4bd4c7778706d8651a2706cdffc5b (diff) | |
| download | libvideoeditor-17887cd0623d1cc8f225505ecc5b5bec78e75b32.tar.gz | |
am 52da22e1: Fix for 5234840 Corrupted frames in transition
* commit '52da22e185f4bd4c7778706d8651a2706cdffc5b':
Fix for 5234840 Corrupted frames in transition
| -rwxr-xr-x | vss/src/M4xVSS_API.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vss/src/M4xVSS_API.c b/vss/src/M4xVSS_API.c index de69cd1..37b2e47 100755 --- a/vss/src/M4xVSS_API.c +++ b/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 = |