diff options
author | James Dong <jdong@google.com> | 2012-02-09 16:32:42 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-02-09 17:14:48 -0800 |
commit | ff65330bfdd2841110d8ff2a1aba3543b2cb3156 (patch) | |
tree | 2095d9438d5d118a4d38c5593197e739f6d97aec /libvideoeditor/vss | |
parent | 0a684cc5346e7d95acd3c3c0582c2b0161815fb0 (diff) | |
download | frameworks_av-ff65330bfdd2841110d8ff2a1aba3543b2cb3156.zip frameworks_av-ff65330bfdd2841110d8ff2a1aba3543b2cb3156.tar.gz frameworks_av-ff65330bfdd2841110d8ff2a1aba3543b2cb3156.tar.bz2 |
Fix green frame issue
When the transition clip is generated: two clips in general are involved.
The second clip was assigned the incorrect effect number when a transition was coupled with a color effect
o patch contributed by Hong Teng <hongteng@nxp.com>
o related-to-bug: 5713461
Change-Id: I61b497620264692b331da8b8e7753240edc5d1aa
Diffstat (limited to 'libvideoeditor/vss')
-rwxr-xr-x | libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c index ee69fd3..59d57e5 100755 --- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c +++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c @@ -1182,8 +1182,6 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn, * Render Clip1 */ if( pC->pC1->isRenderDup == M4OSA_FALSE ) { - pC->bIssecondClip = M4OSA_FALSE; - err = M4VSS3GPP_intRenderFrameWithEffect(pC, pC->pC1, ts, M4OSA_TRUE, pTempPlaneClip1, pTemp1, pPlaneOut); @@ -3594,9 +3592,11 @@ M4OSA_ERR M4VSS3GPP_intRenderFrameWithEffect(M4VSS3GPP_InternalEditContext *pC, } if (bIsClip1 == M4OSA_TRUE) { + pC->bIssecondClip = M4OSA_FALSE; numEffects = pC->nbActiveEffects; } else { numEffects = pC->nbActiveEffects1; + pC->bIssecondClip = M4OSA_TRUE; } if ( numEffects > 0) { |