Cleanup license declarations and remove dv1394d references.

[melted] / src / modules / core / transition_composite.c

diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index b28283d..fdad2cf 100644 (file)
--- a/src/modules/core/transition_composite.c
+++ b/src/modules/core/transition_composite.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "transition_composite.h"
@@ -391,7 +391,7 @@ static void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t
                dest++;
                *dest = sample_mix( *dest, *src++, mix );
                dest++;
-               *alpha_a = mix | *alpha_a;
+               *alpha_a = ( mix >> 8 ) | *alpha_a;
                alpha_a ++;
        }
 }
@@ -408,7 +408,7 @@ static void composite_line_yuv_or( uint8_t *dest, uint8_t *src, int width, uint8
                dest++;
                *dest = sample_mix( *dest, *src++, mix );
                dest++;
-               *alpha_a ++ = mix;
+               *alpha_a ++ = mix >> 8;
        }
 }
 
@@ -424,7 +424,7 @@ static void composite_line_yuv_and( uint8_t *dest, uint8_t *src, int width, uint
                dest++;
                *dest = sample_mix( *dest, *src++, mix );
                dest++;
-               *alpha_a ++ = mix;
+               *alpha_a ++ = mix >> 8;
        }
 }
 
@@ -440,7 +440,7 @@ static void composite_line_yuv_xor( uint8_t *dest, uint8_t *src, int width, uint
                dest++;
                *dest = sample_mix( *dest, *src++, mix );
                dest++;
-               *alpha_a ++ = mix;
+               *alpha_a ++ = mix >> 8;
        }
 }
 
@@ -715,8 +715,9 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
        // Get the properties objects
        mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
        mlt_properties properties = MLT_TRANSITION_PROPERTIES( this );
+       uint8_t resize_alpha = mlt_properties_get_int( b_props, "resize_alpha" );
 
-       if ( mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 )
+       if ( mlt_properties_get_int( properties, "aligned" ) && mlt_properties_get_int( properties, "distort" ) == 0 && mlt_properties_get_int( b_props, "distort" ) == 0 && geometry->item.distort == 0 )
        {
                // Adjust b_frame pixel aspect
                int normalised_width = geometry->item.w;
@@ -746,7 +747,7 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
                // ????: Shouln't this be the default behaviour?
                if ( mlt_properties_get_int( properties, "fill" ) && scaled_width > 0 && scaled_height > 0 )
                {
-                       if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height < normalised_width )
+                       if ( scaled_height < normalised_height && scaled_width * normalised_height / scaled_height <= normalised_width )
                        {
                                scaled_width = rint( 0.5 + scaled_width * normalised_height / scaled_height );
                                scaled_height = normalised_height;
@@ -769,7 +770,12 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
        }
 
        // We want to ensure that we bypass resize now...
-       mlt_properties_set_int( b_props, "distort", mlt_properties_get_int( properties, "distort" ) );
+       if ( resize_alpha == 0 )
+               mlt_properties_set_int( b_props, "distort", mlt_properties_get_int( properties, "distort" ) );
+
+       // If we're not aligned, we want a non-transparent background
+       if ( mlt_properties_get_int( properties, "aligned" ) == 0 )
+               mlt_properties_set_int( b_props, "resize_alpha", 255 );
 
        // Take into consideration alignment for optimisation (titles are a special case)
        if ( !mlt_properties_get_int( properties, "titles" ) )
@@ -781,6 +787,9 @@ static int get_b_frame_image( mlt_transition this, mlt_frame b_frame, uint8_t **
 
        ret = mlt_frame_get_image( b_frame, image, &format, width, height, 1 );
 
+       // Set the frame back
+       mlt_properties_set_int( b_props, "resize_alpha", resize_alpha );
+
        return ret && image != NULL;
 }
 
@@ -1196,6 +1205,9 @@ mlt_transition transition_composite_init( char *arg )
                // Default factory
                mlt_properties_set( properties, "factory", "fezzik" );
 
+               // Use alignment (and hence alpha of b frame)
+               mlt_properties_set_int( properties, "aligned", 1 );
+
                // Inform apps and framework that this is a video only transition
                mlt_properties_set_int( properties, "_transition_type", 1 );
        }