Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for issue : 3439708 Last frame is missing effect"

Browse Source
This commit is contained in:
Dheeraj Sharma
2011-02-11 10:57:31 -08:00
committed by Android (Google) Code Review
parent cfd2eb0f2e fb4e92c4ed
commit 1d830165a0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/mediaeditor/VideoEditorMain.cpp
View File

@@ -444,7 +444,7 @@ static void jniPreviewProgressCallback (void* cookie, M4OSA_UInt32 msgType,
pContext->mOverlayRenderingMode = pContext->pEditSettings->\
pClipList[pCurrEditInfo->clipIndex]->xVSS.MediaRendering;
LOGI("rendering mode %d ", pContext->mOverlayRenderingMode);
LOGV("rendering mode %d ", pContext->mOverlayRenderingMode);
}
@@ -653,7 +653,7 @@ static int videoEditor_renderPreviewFrame(JNIEnv* pEnv,
}
for (i = 0; i < uiNumberOfClipsInStoryBoard; i++) {
if (timeMs < (iIncrementedDuration +
if (timeMs <= (iIncrementedDuration +
(pContext->pEditSettings->pClipList[i]->uiEndCutTime -
pContext->pEditSettings->pClipList[i]->uiBeginCutTime)))
{
@@ -696,6 +696,7 @@ static int videoEditor_renderPreviewFrame(JNIEnv* pEnv,
pContext->pEditSettings->pClipList[iCurrentClipIndex]->ClipProperties.uiVideoHeight,
pContext->pEditSettings->pClipList[iCurrentClipIndex]->ClipProperties.uiVideoWidth,
(M4OSA_Void **)&frameStr.pBuffer);
tnTimeMs = (M4OSA_UInt32)timeMs;
} else {
/* Handle 3gp/mp4 Clips here */
/* get thumbnail*/