X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=7edb53a4da27afa6b57761432ebbbad7b4163e37;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=6dc08e1ce54862c01608c5c874c2ee47ce962158;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 6dc08e1..7edb53a 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 "config.h" @@ -89,11 +89,15 @@ int mlt_producer_init( mlt_producer this, void *child ) if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) { mlt_properties_set_double( properties, "fps", 25.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 25 ); + mlt_properties_set_int( properties, "frame_rate_den", 1 ); mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); } else { mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 30000 ); + mlt_properties_set_int( properties, "frame_rate_den", 1001 ); mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); } mlt_properties_set_double( properties, "_speed", 1.0 ); @@ -194,13 +198,14 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out ) // Special case - allow for a cut of the entire producer (this will squeeze all other cuts to 0) if ( in <= 0 ) in = 0; - if ( ( out < 0 || out >= mlt_producer_get_playtime( parent ) ) && !mlt_producer_is_blank( this ) ) - out = mlt_producer_get_playtime( parent ) - 1; + if ( ( out < 0 || out >= mlt_producer_get_length( parent ) ) && !mlt_producer_is_blank( this ) ) + out = mlt_producer_get_length( parent ) - 1; mlt_properties_inc_ref( parent_props ); mlt_properties_set_int( properties, "_cut", 1 ); mlt_properties_set_data( properties, "_cut_parent", parent, 0, ( mlt_destructor )mlt_producer_close, NULL ); mlt_properties_set_position( properties, "length", mlt_properties_get_position( parent_props, "length" ) ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( parent_props, "aspect_ratio" ) ); mlt_producer_set_in_and_out( result, in, out ); // Mini fezzik :-/ @@ -208,7 +213,6 @@ mlt_producer mlt_producer_cut( mlt_producer this, int in, int out ) mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 ); mlt_producer_attach( result, filter ); mlt_filter_close( filter ); - mlt_events_unblock( MLT_PRODUCER_PROPERTIES( result ), MLT_PRODUCER_PROPERTIES( result ) ); return result; } @@ -245,18 +249,18 @@ int mlt_producer_seek( mlt_producer this, mlt_position position ) mlt_producer_seek( mlt_producer_cut_parent( this ), position + mlt_producer_get_in( this ) ); // Check bounds - if ( position < 0 ) + if ( position < 0 || mlt_producer_get_playtime( this ) == 0 ) { position = 0; } - else if ( use_points && !strcmp( eof, "pause" ) && position >= mlt_producer_get_playtime( this ) ) + else if ( use_points && ( eof == NULL || !strcmp( eof, "pause" ) ) && position >= mlt_producer_get_playtime( this ) ) { mlt_producer_set_speed( this, 0 ); position = mlt_producer_get_playtime( this ) - 1; } else if ( use_points && !strcmp( eof, "loop" ) && position >= mlt_producer_get_playtime( this ) ) { - position = position % mlt_producer_get_playtime( this ); + position = (int)position % (int)mlt_producer_get_playtime( this ); } // Set the position @@ -399,7 +403,8 @@ mlt_position mlt_producer_get_length( mlt_producer this ) void mlt_producer_prepare_next( mlt_producer this ) { - mlt_producer_seek( this, mlt_producer_position( this ) + mlt_producer_get_speed( this ) ); + if ( mlt_producer_get_speed( this ) != 0 ) + mlt_producer_seek( this, mlt_producer_position( this ) + mlt_producer_get_speed( this ) ); } /** Get a frame. @@ -503,6 +508,10 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind // We're done with the clone now mlt_properties_set_data( parent_properties, "use_clone", NULL, 0, NULL, NULL ); + // This is useful and required by always_active transitions to determine in/out points of the cut + if ( mlt_properties_get_data( MLT_FRAME_PROPERTIES( *frame ), "_producer", NULL ) == MLT_PRODUCER_SERVICE( parent ) ) + mlt_properties_set_data( MLT_FRAME_PROPERTIES( *frame ), "_producer", this, 0, NULL, NULL ); + mlt_properties_set_double( MLT_FRAME_PROPERTIES( *frame ), "_speed", speed ); mlt_producer_prepare_next( this ); } @@ -524,6 +533,8 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind char *name = mlt_properties_get_name( p_props, i ); if ( !strncmp( name, "meta.", 5 ) ) mlt_properties_set( f_props, name, mlt_properties_get( p_props, name ) ); + else if ( !strncmp( name, "set.", 4 ) ) + mlt_properties_set( f_props, name + 4, mlt_properties_get( p_props, name ) ); } } @@ -832,6 +843,8 @@ void mlt_producer_close( mlt_producer this ) } else { + int destroy = mlt_producer_is_cut( this ); + #if _MLT_PRODUCER_CHECKS_ == 1 // Show debug info mlt_properties_debug( MLT_PRODUCER_PROPERTIES( this ), "Producer closing", stderr ); @@ -846,6 +859,9 @@ void mlt_producer_close( mlt_producer this ) #endif mlt_service_close( &this->parent ); + + if ( destroy ) + free( this ); } } }