X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_producer.c;h=c874243548cf7a529cdd95d40ae63accdcc521d4;hb=89b7e06e362f01284cd1166a019ae3fa3093a6e4;hp=164ed59e5895d1b2d39feaf8f35c15c27e709f4d;hpb=1a50e779cfd5e1bc6a80054f6f56e64280c2dc41;p=melted diff --git a/src/framework/mlt_producer.c b/src/framework/mlt_producer.c index 164ed59..c874243 100644 --- a/src/framework/mlt_producer.c +++ b/src/framework/mlt_producer.c @@ -53,15 +53,15 @@ int mlt_producer_init( mlt_producer this, void *child ) // Set the default properties mlt_properties_set( properties, "mlt_type", "mlt_producer" ); - mlt_properties_set_timecode( properties, "position", 0.0 ); + mlt_properties_set_position( properties, "position", 0.0 ); mlt_properties_set_double( properties, "frame", 0 ); mlt_properties_set_double( properties, "fps", 25.0 ); mlt_properties_set_double( properties, "speed", 1.0 ); - mlt_properties_set_timecode( properties, "in", 0.0 ); - mlt_properties_set_timecode( properties, "out", 3600.0 ); - mlt_properties_set_timecode( properties, "length", 3600.0 ); - mlt_properties_set_int( properties, "known_length", 1 ); + mlt_properties_set_position( properties, "in", 0.0 ); + mlt_properties_set_position( properties, "out", 179999 ); + mlt_properties_set_position( properties, "length", 180000 ); mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 ); + mlt_properties_set( properties, "log_id", "multitrack" ); // Override service get_frame parent->get_frame = producer_get_frame; @@ -86,70 +86,64 @@ mlt_properties mlt_producer_properties( mlt_producer this ) return mlt_service_properties( &this->parent ); } -/** Seek to a specified time code. +/** Convert frame position to position. */ -int mlt_producer_seek( mlt_producer this, mlt_timecode timecode ) +/* +mlt_position mlt_producer_time( mlt_producer this, int64_t frame ) { - // Check bounds - if ( timecode < 0 ) - timecode = 0; - if ( timecode > mlt_producer_get_playtime( this ) ) - timecode = mlt_producer_get_playtime( this ); - - // Set the position - mlt_properties_set_timecode( mlt_producer_properties( this ), "position", timecode ); + if ( frame < 0 ) + return -1; + else + return ( mlt_position )frame / mlt_producer_get_fps( this ); +} +*/ - // Calculate the absolute frame - double frame = ( mlt_producer_get_in( this ) + timecode ) * mlt_producer_get_fps( this ); - mlt_properties_set_double( mlt_producer_properties( this ), "frame", floor( frame + 0.5 ) ); +/** Convert position to frame position. +*/ - return 0; +/* +int64_t mlt_producer_frame_position( mlt_producer this, mlt_position position ) +{ + if ( position < 0 ) + return -1; + else + return ( int64_t )( floor( position * mlt_producer_get_fps( this ) + 0.5 ) ); } +*/ -/** Seek to a specified absolute frame. +/** Seek to a specified position. */ -int mlt_producer_seek_frame( mlt_producer this, uint64_t frame ) +int mlt_producer_seek( mlt_producer this, mlt_position position ) { - // Calculate the time code - double timecode = ( frame / mlt_producer_get_fps( this ) ) - mlt_producer_get_in( this ); + // Check bounds + if ( position < 0 ) + position = 0; + else if ( position > mlt_producer_get_playtime( this ) ) + position = mlt_producer_get_playtime( this ) - 1; - // If timecode is invalid, then seek on time - if ( timecode < 0 ) - { - // Seek to the in point - mlt_producer_seek( this, 0 ); - } - else if ( timecode > mlt_producer_get_playtime( this ) ) - { - // Seek to the out point - mlt_producer_seek( this, mlt_producer_get_playtime( this ) ); - } - else - { - // Set the position - mlt_properties_set_timecode( mlt_producer_properties( this ), "position", timecode ); + // Set the position + mlt_properties_set_position( mlt_producer_properties( this ), "position", position ); - // Set the absolute frame - mlt_properties_set_double( mlt_producer_properties( this ), "frame", frame ); - } + // Calculate the absolute frame + mlt_properties_set_position( mlt_producer_properties( this ), "frame", mlt_producer_get_in( this ) + position ); return 0; } -/** Get the current time code. +/** Get the current position (relative to in point). */ -mlt_timecode mlt_producer_position( mlt_producer this ) +mlt_position mlt_producer_position( mlt_producer this ) { - return mlt_properties_get_timecode( mlt_producer_properties( this ), "position" ); + return mlt_properties_get_position( mlt_producer_properties( this ), "position" ); } -/** Get the current frame. +/** Get the current position (relative to start of producer). */ -uint64_t mlt_producer_frame( mlt_producer this ) +mlt_position mlt_producer_frame( mlt_producer this ) { return mlt_properties_get_double( mlt_producer_properties( this ), "frame" ); } @@ -181,32 +175,30 @@ double mlt_producer_get_fps( mlt_producer this ) /** Set the in and out points. */ -int mlt_producer_set_in_and_out( mlt_producer this, mlt_timecode in, mlt_timecode out ) +int mlt_producer_set_in_and_out( mlt_producer this, mlt_position in, mlt_position out ) { // Correct ins and outs if necessary if ( in < 0 ) in = 0; - if ( in > mlt_producer_get_length( this ) ) + else if ( in > mlt_producer_get_length( this ) ) in = mlt_producer_get_length( this ); + if ( out < 0 ) out = 0; - if ( out > mlt_producer_get_length( this ) ) + else if ( out > mlt_producer_get_length( this ) ) out = mlt_producer_get_length( this ); // Swap ins and outs if wrong if ( out < in ) { - mlt_timecode t = in; + mlt_position t = in; in = out; out = t; } // Set the values - mlt_properties_set_timecode( mlt_producer_properties( this ), "in", in ); - mlt_properties_set_timecode( mlt_producer_properties( this ), "out", out ); - - // Seek to the in point - mlt_producer_seek( this, 0 ); + mlt_properties_set_position( mlt_producer_properties( this ), "in", in ); + mlt_properties_set_position( mlt_producer_properties( this ), "out", out ); return 0; } @@ -214,33 +206,33 @@ int mlt_producer_set_in_and_out( mlt_producer this, mlt_timecode in, mlt_timecod /** Get the in point. */ -mlt_timecode mlt_producer_get_in( mlt_producer this ) +mlt_position mlt_producer_get_in( mlt_producer this ) { - return mlt_properties_get_timecode( mlt_producer_properties( this ), "in" ); + return mlt_properties_get_position( mlt_producer_properties( this ), "in" ); } /** Get the out point. */ -mlt_timecode mlt_producer_get_out( mlt_producer this ) +mlt_position mlt_producer_get_out( mlt_producer this ) { - return mlt_properties_get_timecode( mlt_producer_properties( this ), "out" ); + return mlt_properties_get_position( mlt_producer_properties( this ), "out" ); } /** Get the total play time. */ -mlt_timecode mlt_producer_get_playtime( mlt_producer this ) +mlt_position mlt_producer_get_playtime( mlt_producer this ) { - return mlt_producer_get_out( this ) - mlt_producer_get_in( this ); + return mlt_producer_get_out( this ) - mlt_producer_get_in( this ) + 1; } /** Get the total length of the producer. */ -mlt_timecode mlt_producer_get_length( mlt_producer this ) +mlt_position mlt_producer_get_length( mlt_producer this ) { - return mlt_properties_get_timecode( mlt_producer_properties( this ), "length" ); + return mlt_properties_get_position( mlt_producer_properties( this ), "length" ); } /** Prepare for next frame. @@ -248,7 +240,7 @@ mlt_timecode mlt_producer_get_length( mlt_producer this ) void mlt_producer_prepare_next( mlt_producer this ) { - mlt_producer_seek_frame( this, mlt_producer_frame( this ) + mlt_producer_get_speed( this ) ); + mlt_producer_seek( this, mlt_producer_frame( this ) + mlt_producer_get_speed( this ) ); } /** Get a frame. @@ -270,16 +262,18 @@ static int producer_get_frame( mlt_service service, mlt_frame_ptr frame, int ind // Generate a test frame *frame = mlt_frame_init( ); - // Set the timecode - result = mlt_frame_set_timecode( *frame, mlt_producer_position( this ) ); + // Set the position + result = mlt_frame_set_position( *frame, mlt_producer_position( this ) ); - // Calculate the next timecode + // Calculate the next position mlt_producer_prepare_next( this ); } - // Copy the fps of the producer onto the frame + // Copy the fps and speed of the producer onto the frame mlt_properties properties = mlt_frame_properties( *frame ); mlt_properties_set_double( properties, "fps", mlt_producer_get_fps( this ) ); + double speed = mlt_producer_get_speed( this ); + mlt_properties_set_double( properties, "speed", speed ); return 0; }