diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-08-29 20:37:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-29 20:37:20 -0700 |
| commit | dac2f050b814bd72ff66b4ae58634c25fb2185ff (patch) | |
| tree | 9bf74fa66ebe0fd38af9a1aa556bf97fae46b0d2 | |
| parent | a007d502e7572b225124eea31defbd27b59d4161 (diff) | |
| parent | d125366181feab7e45905a8051c94ab5a845e503 (diff) | |
| download | frameworks_av-dac2f050b814bd72ff66b4ae58634c25fb2185ff.zip frameworks_av-dac2f050b814bd72ff66b4ae58634c25fb2185ff.tar.gz frameworks_av-dac2f050b814bd72ff66b4ae58634c25fb2185ff.tar.bz2 | |
Merge "Fix 5200858: we need to pass timestamp to render correct frames."
| -rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c index b880dc3..3dd837a 100755 --- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c +++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c @@ -98,6 +98,7 @@ static M4OSA_ERR M4VSS3GPP_intSetYuv420PlaneFromARGB888 ( static M4OSA_ERR M4VSS3GPP_intRenderFrameWithEffect( M4VSS3GPP_InternalEditContext *pC, M4VSS3GPP_ClipContext* pClipCtxt, + M4_MediaTime ts, M4OSA_Bool bIsClip1, M4VIFI_ImagePlane *pResizePlane, M4VIFI_ImagePlane *pPlaneNoResize, @@ -1188,7 +1189,7 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn, { pC->bIssecondClip = M4OSA_FALSE; - err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC1, M4OSA_TRUE, + err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC1, ts, M4OSA_TRUE, pTempPlaneClip1, pTemp1, pPlaneOut); if ((M4NO_ERROR != err) && @@ -1228,7 +1229,7 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn, if( pC->pC2->isRenderDup == M4OSA_FALSE ) { - err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC2, M4OSA_FALSE, + err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC2, ts, M4OSA_FALSE, pTempPlaneClip2, pTemp2, pPlaneOut); if ((M4NO_ERROR != err) && @@ -3287,6 +3288,7 @@ M4OSA_ERR M4VSS3GPP_intSetYuv420PlaneFromARGB888 ( M4OSA_ERR M4VSS3GPP_intRenderFrameWithEffect(M4VSS3GPP_InternalEditContext *pC, M4VSS3GPP_ClipContext* pClipCtxt, + M4_MediaTime ts, M4OSA_Bool bIsClip1, M4VIFI_ImagePlane *pResizePlane, M4VIFI_ImagePlane *pPlaneNoResize, @@ -3294,7 +3296,6 @@ M4OSA_ERR M4VSS3GPP_intRenderFrameWithEffect(M4VSS3GPP_InternalEditContext *pC, M4OSA_ERR err = M4NO_ERROR; M4OSA_UInt8 numEffects = 0; - M4_MediaTime ts; M4VIFI_ImagePlane *pDecoderRenderFrame = M4OSA_NULL; /** @@ -3340,7 +3341,7 @@ M4OSA_ERR M4VSS3GPP_intRenderFrameWithEffect(M4VSS3GPP_InternalEditContext *pC, err = pClipCtxt->ShellAPI.m_pVideoDecoder->m_pFctRender( pClipCtxt->pViDecCtxt, &ts, pClipCtxt->m_pPreResizeFrame, M4OSA_TRUE); - } + } } if (M4NO_ERROR != err) { |