[coreImage, addLogo] Allow to reduce opacity of logo images containin…

…g alpha channel
mean00 · Dec 15, 2017 · c9f8f26 · c9f8f26
1 parent 03ff117
commit c9f8f26
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/avidemux_core/ADM_coreImage/include/ADM_image.h b/avidemux_core/ADM_coreImage/include/ADM_image.h
@@ -159,7 +159,7 @@ virtual                 ~ADMImage();
         bool    blacken(void);
         bool    copyTo(ADMImage *target, uint32_t x, uint32_t y);
         bool    copyToAlpha(ADMImage *target, uint32_t x, uint32_t y,uint32_t alpha);
-        bool    copyWithAlphaChannel(ADMImage *target, uint32_t x, uint32_t y);
+        bool    copyWithAlphaChannel(ADMImage *target, uint32_t x, uint32_t y, uint32_t opacity=255);
         bool    copyLeftSideTo(ADMImage *dest);
         /* Some utilitarian functions */
         bool    saveAsBmp(const char *filename);

diff --git a/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp b/avidemux_core/ADM_coreImage/src/ADM_imageOperation.cpp
@@ -229,13 +229,18 @@ bool ADMImage::copyToAlpha(ADMImage *dest, uint32_t x,uint32_t y,uint32_t alpha)
  * @return 
  */
 
-static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha,int dstStride, int srcStride,int alphaStride,int w,int h, int mul)
+static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha, int dstStride, int srcStride, int alphaStride, int w, int h, int mul, uint32_t opacity)
 {
     for(int k=0;k<h;k++)
     {
         for(int j=0;j<w;j++)
         {
             int a=alpha[mul*j];
+            if(opacity<255)
+            {
+                a*=opacity;
+                a>>=8;
+            }
             uint32_t x=(255-a)*dst[j]+a*src[j];
             dst[j]=x>>8;
         }
@@ -245,9 +250,8 @@ static bool blitWithAlpha(uint8_t *dst, uint8_t *src, uint8_t *alpha,int dstStri
     }
     return true;
 }
-bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y)
+bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y,uint32_t opacity)
 {
-
     uint32_t box_w=_width, box_h=_height;
     // Clip if needed
     if(y>dest->_height)
@@ -293,7 +297,7 @@ bool ADMImage::copyWithAlphaChannel(ADMImage *dest, uint32_t x,uint32_t y)
                         dstPitches[i], 
                         srcPitches[i], 
                         alphaStride,
-                        ww,hh,mul);
+                        ww,hh,mul,opacity);
     }
     return 1;
 }

diff --git a/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp b/avidemux_plugins/ADM_videoFilters6/logo/ADM_vidLogo.cpp
@@ -88,7 +88,7 @@ bool addLogopFilter::getNextFrame(uint32_t *fn,ADMImage *image)
     if(myImage)
     {
         if(myImage->GetReadPtr(PLANAR_ALPHA))
-            myImage->copyWithAlphaChannel(image,configuration.x,configuration.y);
+            myImage->copyWithAlphaChannel(image,configuration.x,configuration.y,configuration.alpha);
         else
             myImage->copyToAlpha(image,configuration.x,configuration.y,configuration.alpha);
     }

diff --git a/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp b/avidemux_plugins/ADM_videoFilters6/logo/qt4/Q_logo.cpp
@@ -135,13 +135,9 @@ bool                Ui_logoWindow::tryToLoadimage(const char *imageName)
             imageHeight=image->GetHeight(PLANAR_Y);            
             this->imageName=std::string(imageName);
             ui.labelImage->setText(this->imageName.c_str());
-
             if(image->GetReadPtr(PLANAR_ALPHA))
-                ui.spinAlpha->setEnabled(false);
-            else
-                ui.spinAlpha->setEnabled(true);
-            status=true;    
-
+                ADM_info("We have alpha\n");
+            status=true;
         }
     }
     enableLowPart(status);
@@ -368,10 +364,7 @@ uint8_t    flyLogo::processYuv(ADMImage* in, ADMImage *out)
 
     ADMImage *myImage=parent->image;
     if(myImage->GetReadPtr(PLANAR_ALPHA))
-    {
-        ADM_info("We have alpha\n");
-        myImage->copyWithAlphaChannel(out,param.x,param.y);
-    }
+        myImage->copyWithAlphaChannel(out,param.x,param.y,param.alpha);
     else
         myImage->copyToAlpha(out,param.x,param.y,param.alpha);
     return true;