summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss
diff options
context:
space:
mode:
authorRajneesh Chowdury <rajneeshc@google.com>2011-09-22 10:51:02 -0700
committerRajneesh Chowdury <rajneeshc@google.com>2011-09-22 10:51:02 -0700
commit738a66268a5d4ad948714dc095711cb4a21997f3 (patch)
tree8cee9ea630986b2b431b4d6c06795726237580f2 /libvideoeditor/vss
parent6bf2671a1f40c0c564cab2774765f5dba0583703 (diff)
downloadframeworks_av-738a66268a5d4ad948714dc095711cb4a21997f3.zip
frameworks_av-738a66268a5d4ad948714dc095711cb4a21997f3.tar.gz
frameworks_av-738a66268a5d4ad948714dc095711cb4a21997f3.tar.bz2
Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other
Set the alpha blending value correctly. Change-Id: I6aaed47144d09d182afb1c70d5bb72b7360fb51e
Diffstat (limited to 'libvideoeditor/vss')
-rwxr-xr-xlibvideoeditor/vss/src/M4xVSS_internal.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c
index a322caa..5844115 100755
--- a/libvideoeditor/vss/src/M4xVSS_internal.c
+++ b/libvideoeditor/vss/src/M4xVSS_internal.c
@@ -4240,11 +4240,11 @@ M4OSA_ERR M4xVSS_AlphaMagic( M4OSA_Void *userData, M4VIFI_ImagePlane PlaneIn1[3]
alphaContext = (M4xVSS_internal_AlphaMagicSettings*)userData;
- alphaProgressLevel = (pProgress->uiProgress * 255)/1000;
+ alphaProgressLevel = (pProgress->uiProgress * 128)/1000;
if( alphaContext->isreverse != M4OSA_FALSE)
{
- alphaProgressLevel = 255 - alphaProgressLevel;
+ alphaProgressLevel = 128 - alphaProgressLevel;
planeswap = PlaneIn1;
PlaneIn1 = PlaneIn2;
PlaneIn2 = planeswap;
@@ -4356,11 +4356,11 @@ M4OSA_ERR M4xVSS_AlphaMagicBlending( M4OSA_Void *userData, M4VIFI_ImagePlane Pla
alphaContext = (M4xVSS_internal_AlphaMagicSettings*)userData;
- alphaProgressLevel = (pProgress->uiProgress * 255)/1000;
+ alphaProgressLevel = (pProgress->uiProgress * 128)/1000;
if( alphaContext->isreverse != M4OSA_FALSE)
{
- alphaProgressLevel = 255 - alphaProgressLevel;
+ alphaProgressLevel = 128 - alphaProgressLevel;
planeswap = PlaneIn1;
PlaneIn1 = PlaneIn2;
PlaneIn2 = planeswap;