commit cf41fc8eff715d7ee1336d7a00db4b8ab76e03c1
author Rajneesh Chowdury <rajneeshc@google.com> Fri Sep 23 14:44:56 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 23 14:44:56 2011 -0700
tree 8cee9ea630986b2b431b4d6c06795726237580f2
parent 738a66268a5d4ad948714dc095711cb4a21997f3
parent 2f7a01be34e511f7a89ce9a3936659e11e7df506

am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

* commit '996fb989eb4cbe80c91cfe3ef4d32f349dffa72d':
  DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set

libvideoeditor/vss/src/M4xVSS_internal.c

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 @@
 
     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 @@
 
     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;