* 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.
+ * Adapted from Kino Plugin Timfx, which is
+ * Copyright (C) 2002 Timothy M. Shead <tshead@k-3d.com>
*
- * This program is distributed in the hope that it will be useful,
+ * 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 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_luma.h"
#include <framework/mlt.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <math.h>
-
-/** Calculate the position for this frame.
-*/
-
-static float position_calculate( mlt_transition this, mlt_frame frame )
-{
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
-
- // Get the position of the frame
- char *name = mlt_properties_get( mlt_transition_properties( this ), "_unique_id" );
- mlt_position position = mlt_properties_get_position( mlt_frame_properties( frame ), name );
-
- // Now do the calcs
- return ( float )( position - in ) / ( float )( out - in + 1 );
-}
-
-/** Calculate the field delta for this frame - position between two frames.
-*/
-
-static float delta_calculate( mlt_transition this, mlt_frame frame )
-{
- // Get the in and out position
- mlt_position in = mlt_transition_get_in( this );
- mlt_position out = mlt_transition_get_out( this );
-
- // Get the position of the frame
- mlt_position position = mlt_frame_get_position( frame );
-
- // Now do the calcs
- float x = ( float )( position - in ) / ( float )( out - in + 1 );
- float y = ( float )( position + 1 - in ) / ( float )( out - in + 1 );
-
- return ( y - x ) / 2.0;
-}
+#include "transition_composite.h"
static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
{
int ret = 0;
+ int i = height + 1;
int width_src = width, height_src = height;
mlt_image_format format = mlt_image_yuv422;
uint8_t *p_src, *p_dest;
- uint8_t *p;
- uint8_t *limit;
-
- int32_t weigh = weight * ( 1 << 16 );
- int32_t weigh_complement = ( 1 - weight ) * ( 1 << 16 );
+ uint8_t *alpha_src;
+ uint8_t *alpha_dst;
+ int mix = weight * ( 1 << 16 );
+ if ( mlt_properties_get( &this->parent, "distort" ) )
+ mlt_properties_set( &that->parent, "distort", mlt_properties_get( &this->parent, "distort" ) );
mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 );
+ alpha_dst = mlt_frame_get_alpha_mask( this );
mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 );
+ alpha_src = mlt_frame_get_alpha_mask( that );
- p = p_dest;
- limit = p_dest + height_src * width_src * 2;
+ // Pick the lesser of two evils ;-)
+ width_src = width_src > width ? width : width_src;
+ height_src = height_src > height ? height : height_src;
- while ( p < limit )
+ while ( --i )
{
- *p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
- *p_dest++ = ( *p_src++ * weigh + *p++ * weigh_complement ) >> 16;
+ composite_line_yuv( p_dest, p_src, width_src, alpha_src, alpha_dst, mix, NULL, 0, 0 );
+ p_src += width_src << 1;
+ p_dest += width << 1;
+ alpha_src += width_src;
+ alpha_dst += width;
}
return ret;
// image processing functions
-static inline uint32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
+static inline int32_t smoothstep( int32_t edge1, int32_t edge2, uint32_t a )
{
if ( a < edge1 )
return 0;
int stride_dest;
uint16_t weight = 0;
- format_src = mlt_image_yuv422;
- format_dest = mlt_image_yuv422;
-
+ if ( mlt_properties_get( &a_frame->parent, "distort" ) )
+ mlt_properties_set( &b_frame->parent, "distort", mlt_properties_get( &a_frame->parent, "distort" ) );
mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 );
mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 );
+ if ( *width == 0 || *height == 0 )
+ return;
+
+ // Pick the lesser of two evils ;-)
+ width_src = width_src > width_dest ? width_dest : width_src;
+ height_src = height_src > height_dest ? height_dest : height_src;
+
stride_src = width_src * 2;
stride_dest = width_dest * 2;
int32_t i_softness = softness * ( 1 << 16 );
- int field_count = field_order <= 0 ? 1 : 2;
+ int field_count = field_order < 0 ? 1 : 2;
int field_stride_src = field_count * stride_src;
int field_stride_dest = field_count * stride_dest;
-
int field = 0;
// composite using luma map
{
p_row = p_src + field * stride_src;
q_row = p_dest + field * stride_dest;
- y_offset = ( field * luma_width ) << 16;
+ y_offset = field << 16;
i = field;
while ( i < height_src )
static void luma_read_yuv422( uint8_t *image, uint16_t **map, int width, int height )
{
int i;
+ int size = width * height * 2;
// allocate the luma bitmap
uint16_t *p = *map = ( uint16_t* )mlt_pool_alloc( width * height * sizeof( uint16_t ) );
return;
// proces the image data into the luma bitmap
- for ( i = 0; i < width * height * 2; i += 2 )
+ for ( i = 0; i < size; i += 2 )
*p++ = ( image[ i ] - 16 ) * 299; // 299 = 65535 / 219
}
-/** Generate a luma map from a YUV image.
-*/
-static void luma_read_rgb24( uint8_t *image, uint16_t **map, int width, int height )
-{
-}
-
/** Get the image.
*/
static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
{
+ // Get the b frame from the stack
+ mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+
// Get the transition object
mlt_transition transition = mlt_frame_pop_service( a_frame );
// Get the properties of the transition
- mlt_properties properties = mlt_transition_properties( transition );
+ mlt_properties properties = MLT_TRANSITION_PROPERTIES( transition );
// Get the properties of the a frame
- mlt_properties a_props = mlt_frame_properties( a_frame );
-
- // Get the b frame from the stack
- mlt_frame b_frame = mlt_frame_pop_frame( a_frame );
+ mlt_properties a_props = MLT_FRAME_PROPERTIES( a_frame );
// Get the properties of the b frame
- mlt_properties b_props = mlt_frame_properties( b_frame );
+ mlt_properties b_props = MLT_FRAME_PROPERTIES( b_frame );
+
+ // This compositer is yuv422 only
+ *format = mlt_image_yuv422;
+
+ mlt_service_lock( MLT_TRANSITION_SERVICE( transition ) );
// The cached luma map information
int luma_width = mlt_properties_get_int( properties, "width" );
int luma_height = mlt_properties_get_int( properties, "height" );
uint16_t *luma_bitmap = mlt_properties_get_data( properties, "bitmap", NULL );
+ char *current_resource = mlt_properties_get( properties, "_resource" );
// If the filename property changed, reload the map
char *resource = mlt_properties_get( properties, "resource" );
- if ( luma_bitmap == NULL && resource != NULL )
+ // Correct width/height if not specified
+ if ( luma_width == 0 || luma_height == 0 )
+ {
+ luma_width = *width;
+ luma_height = *height;
+ }
+
+ if ( resource && ( !current_resource || strcmp( resource, current_resource ) ) )
{
- char *extension = extension = strrchr( resource, '.' );
+ char temp[ 512 ];
+ char *extension = strrchr( resource, '.' );
+ char *orig_resource = resource;
+
+ if ( strchr( resource, '%' ) )
+ {
+ FILE *test;
+ sprintf( temp, "%s/lumas/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( resource, '%' ) + 1 );
+ test = fopen( temp, "r" );
+ if ( test == NULL )
+ strcat( temp, ".png" );
+ else
+ fclose( test );
+ resource = temp;
+ extension = strrchr( resource, '.' );
+ }
// See if it is a PGM
if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
{
// Open PGM
- FILE *f = fopen( resource, "r" );
+ FILE *f = fopen( resource, "rb" );
if ( f != NULL )
{
// Load from PGM
// Set the transition properties
mlt_properties_set_int( properties, "width", luma_width );
mlt_properties_set_int( properties, "height", luma_height );
+ mlt_properties_set( properties, "_resource", orig_resource );
mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
}
}
+ else if (!*resource)
+ {
+ luma_bitmap = NULL;
+ mlt_properties_set( properties, "_resource", NULL );
+ mlt_properties_set_data( properties, "bitmap", luma_bitmap, 0, mlt_pool_release, NULL );
+ }
else
{
// Get the factory producer service
char *factory = mlt_properties_get( properties, "factory" );
// Create the producer
- mlt_producer producer = mlt_factory_producer( factory, resource );
+ mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( transition ) );
+ mlt_producer producer = mlt_factory_producer( profile, factory, resource );
// If we have one
if ( producer != NULL )
{
// Get the producer properties
- mlt_properties producer_properties = mlt_producer_properties( producer );
+ mlt_properties producer_properties = MLT_PRODUCER_PROPERTIES( producer );
// Ensure that we loop
mlt_properties_set( producer_properties, "eof", "loop" );
mlt_frame luma_frame = NULL;
// Get the luma frame
- if ( mlt_service_get_frame( mlt_producer_service( producer ), &luma_frame, 0 ) == 0 )
+ if ( mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &luma_frame, 0 ) == 0 )
{
- uint8_t *luma_image;
+ uint8_t *luma_image = NULL;
mlt_image_format luma_format = mlt_image_yuv422;
- // Request a luma image the size of transition image request
- luma_width = *width;
- luma_height = *height;
-
// Get image from the luma producer
- mlt_properties_set( mlt_frame_properties( luma_frame ), "distort", "true" );
+ mlt_properties_set( MLT_FRAME_PROPERTIES( luma_frame ), "rescale.interp", "nearest" );
mlt_frame_get_image( luma_frame, &luma_image, &luma_format, &luma_width, &luma_height, 0 );
// Generate the luma map
- if ( luma_image != NULL && luma_format == mlt_image_yuv422 )
+ if ( luma_image != NULL )
luma_read_yuv422( luma_image, &luma_bitmap, luma_width, luma_height );
-
- else if ( luma_image != NULL && luma_format == mlt_image_rgb24 )
- luma_read_rgb24( luma_image, &luma_bitmap, luma_width, luma_height );
// Set the transition properties
mlt_properties_set_int( properties, "width", luma_width );
mlt_properties_set_int( properties, "height", luma_height );
+ mlt_properties_set( properties, "_resource", orig_resource);
mlt_properties_set_data( properties, "bitmap", luma_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
// Cleanup the luma frame
}
// Arbitrary composite defaults
- float mix = position_calculate( transition, a_frame );
- float frame_delta = delta_calculate( transition, a_frame );
-
+ float mix = mlt_transition_get_progress( transition, a_frame );
+ float frame_delta = mlt_transition_get_progress_delta( transition, a_frame );
float luma_softness = mlt_properties_get_double( properties, "softness" );
- int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
- mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+ int progressive =
+ mlt_properties_get_int( a_props, "consumer_deinterlace" ) ||
+ mlt_properties_get_int( properties, "progressive" ) ||
mlt_properties_get_int( b_props, "luma.progressive" );
int top_field_first = mlt_properties_get_int( b_props, "top_field_first" );
int reverse = mlt_properties_get_int( properties, "reverse" );
-
- // Since we are the consumer of the b_frame, we must pass along this
- // consumer property from the a_frame
- mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
- mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) );
+ int invert = mlt_properties_get_int( properties, "invert" );
// Honour the reverse here
if ( mix >= 1.0 )
mix -= floor( mix );
- mix = reverse ? 1 - mix : mix;
- frame_delta *= reverse ? -1.0 : 1.0;
-
- // Ensure we get scaling on the b_frame
- mlt_properties_set( b_props, "rescale.interp", "nearest" );
+ if ( mlt_properties_get( properties, "fixed" ) )
+ mix = mlt_properties_get_double( properties, "fixed" );
if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
+ {
+ reverse = invert ? !reverse : reverse;
+ mix = reverse ? 1 - mix : mix;
+ frame_delta *= reverse ? -1.0 : 1.0;
// Composite the frames using a luma map
- luma_composite( a_frame, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
+ luma_composite( !invert ? a_frame : b_frame, !invert ? b_frame : a_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
luma_softness, progressive ? -1 : top_field_first, width, height );
+ }
else
+ {
+ mix = ( reverse || invert ) ? 1 - mix : mix;
+ invert = 0;
// Dissolve the frames using the time offset for mix value
dissolve_yuv( a_frame, b_frame, mix, *width, *height );
+ }
+
+ mlt_service_unlock( MLT_TRANSITION_SERVICE( transition ) );
// Extract the a_frame image info
- *width = mlt_properties_get_int( a_props, "width" );
- *height = mlt_properties_get_int( a_props, "height" );
- *image = mlt_properties_get_data( a_props, "image", NULL );
+ *width = mlt_properties_get_int( !invert ? a_props : b_props, "width" );
+ *height = mlt_properties_get_int( !invert ? a_props : b_props, "height" );
+ *image = mlt_properties_get_data( !invert ? a_props : b_props, "image", NULL );
return 0;
}
static mlt_frame transition_process( mlt_transition transition, mlt_frame a_frame, mlt_frame b_frame )
{
- // Get a unique name to store the frame position
- char *name = mlt_properties_get( mlt_transition_properties( transition ), "_unique_id" );
-
- // Assign the current position to the name
- mlt_properties_set_position( mlt_frame_properties( a_frame ), name, mlt_frame_get_position( a_frame ) );
-
// Push the transition on to the frame
mlt_frame_push_service( a_frame, transition );
- // Push the transition method
- mlt_frame_push_get_image( a_frame, transition_get_image );
-
// Push the b_frame on to the stack
mlt_frame_push_frame( a_frame, b_frame );
+ // Push the transition method
+ mlt_frame_push_get_image( a_frame, transition_get_image );
+
return a_frame;
}
/** Constructor for the filter.
*/
-mlt_transition transition_luma_init( char *lumafile )
+mlt_transition transition_luma_init( mlt_profile profile, mlt_service_type type, const char *id, char *lumafile )
{
mlt_transition transition = mlt_transition_new( );
if ( transition != NULL )
transition->process = transition_process;
// Default factory
- mlt_properties_set( mlt_transition_properties( transition ), "factory", "fezzik" );
+ mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "factory", mlt_environment( "MLT_PRODUCER" ) );
// Set the main property
- mlt_properties_set( mlt_transition_properties( transition ), "resource", lumafile );
+ mlt_properties_set( MLT_TRANSITION_PROPERTIES( transition ), "resource", lumafile );
+ // Inform apps and framework that this is a video only transition
+ mlt_properties_set_int( MLT_TRANSITION_PROPERTIES( transition ), "_transition_type", 1 );
+
return transition;
}
return NULL;
projects / mlt / blobdiff