X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_unit.c;h=5f606e23e56e4b00eb0d37fc0f31254b9173e67f;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=4fbfdbc2bd88deca8b9030507f8787d72fa5d5c5;hpb=8a3795b090723264c973d274eedc28da480e76fd;p=melted diff --git a/src/miracle/miracle_unit.c b/src/miracle/miracle_unit.c index 4fbfdbc..5f606e2 100644 --- a/src/miracle/miracle_unit.c +++ b/src/miracle/miracle_unit.c @@ -1,5 +1,5 @@ /* - * miracle_unit.c -- DV Transmission Unit Implementation + * miracle_unit.c -- Transmission Unit Implementation * Copyright (C) 2002-2003 Ushodaya Enterprises Limited * Author: Dan Dennedy * @@ -69,7 +69,6 @@ miracle_unit miracle_unit_init( int index, char *constructor ) mlt_playlist playlist = mlt_playlist_init( ); this = calloc( sizeof( miracle_unit_t ), 1 ); this->properties = mlt_properties_new( ); - this->producers = mlt_properties_new( ); mlt_properties_init( this->properties, this ); mlt_properties_set_int( this->properties, "unit", index ); mlt_properties_set_int( this->properties, "generation", 0 ); @@ -78,7 +77,7 @@ miracle_unit miracle_unit_init( int index, char *constructor ) mlt_properties_set( this->properties, "arg", arg ); mlt_properties_set_data( this->properties, "consumer", consumer, 0, ( mlt_destructor )mlt_consumer_close, NULL ); mlt_properties_set_data( this->properties, "playlist", playlist, 0, ( mlt_destructor )mlt_playlist_close, NULL ); - mlt_consumer_connect( consumer, mlt_playlist_service( playlist ) ); + mlt_consumer_connect( consumer, MLT_PLAYLIST_SERVICE( playlist ) ); } return this; @@ -132,7 +131,7 @@ void miracle_unit_set_notifier( miracle_unit this, valerie_notifier notifier, ch { mlt_properties properties = this->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_properties playlist_properties = mlt_playlist_properties( playlist ); + mlt_properties playlist_properties = MLT_PLAYLIST_PROPERTIES( playlist ); mlt_properties_set( properties, "root", root_dir ); mlt_properties_set_data( properties, "notifier", notifier, 0, NULL, NULL ); @@ -142,33 +141,12 @@ void miracle_unit_set_notifier( miracle_unit this, valerie_notifier notifier, ch miracle_unit_status_communicate( this ); } -static mlt_producer create_producer( char *file ) -{ - return mlt_factory_producer( "fezzik", file ); -} - /** Create or locate a producer for the file specified. */ static mlt_producer locate_producer( miracle_unit unit, char *file ) { - // Get the unit properties - mlt_properties properties = unit->producers; - - // Check if we already have loaded this file - mlt_producer result = mlt_properties_get_data( properties, file, NULL ); - - if ( result == NULL ) - { - // Create the producer - result = create_producer( file ); - - // Now store the result - if ( result != NULL ) - mlt_properties_set_data( properties, file, result, 0, ( mlt_destructor )mlt_producer_close, NULL ); - } - - return result; + return mlt_factory_producer( "fezzik", file ); } /** Update the generation count. @@ -188,15 +166,12 @@ static void clear_unit( miracle_unit unit ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_clear( playlist ); mlt_producer_seek( producer, 0 ); - - if ( unit->old_producers != NULL ) - mlt_properties_close( unit->old_producers ); - unit->old_producers = unit->producers; - unit->producers = mlt_properties_new( ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); } @@ -210,21 +185,43 @@ static void clean_unit( miracle_unit unit ) mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); mlt_playlist_clip_info info; int current = mlt_playlist_current_clip( playlist ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_position position = mlt_producer_frame( producer ); double speed = mlt_producer_get_speed( producer ); mlt_playlist_get_clip_info( playlist, &info, current ); - if ( info.resource != NULL ) + if ( info.producer != NULL ) { - void *instance = mlt_properties_get_data( unit->producers, info.resource, NULL ); + mlt_properties_inc_ref( MLT_PRODUCER_PROPERTIES( info.producer ) ); position -= info.start; - mlt_properties_set_data( unit->producers, info.resource, instance, 0, NULL, NULL ); clear_unit( unit ); - mlt_playlist_append_io( playlist, instance, info.frame_in, info.frame_out ); - mlt_properties_set_data( unit->producers, info.resource, instance, 0, ( mlt_destructor )mlt_producer_close, NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); + mlt_playlist_append_io( playlist, info.producer, info.frame_in, info.frame_out ); mlt_producer_seek( producer, position ); mlt_producer_set_speed( producer, speed ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); + mlt_producer_close( info.producer ); + } + + update_generation( unit ); +} + +/** Remove everything up to the current clip from the unit. +*/ + +static void wipe_unit( miracle_unit unit ) +{ + mlt_properties properties = unit->properties; + mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_playlist_clip_info info; + int current = mlt_playlist_current_clip( playlist ); + mlt_playlist_get_clip_info( playlist, &info, current ); + + if ( info.producer != NULL && info.start > 0 ) + { + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); + mlt_playlist_remove_region( playlist, 0, info.start - 1 ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); } update_generation( unit ); @@ -245,10 +242,14 @@ void miracle_unit_report_list( miracle_unit unit, valerie_response response ) for ( i = 0; i < mlt_playlist_count( playlist ); i ++ ) { mlt_playlist_clip_info info; + char *title; mlt_playlist_get_clip_info( playlist , &info, i ); - valerie_response_printf( response, 10240, "%d \"%s\" %lld %lld %lld %lld %.2f\n", + title = mlt_properties_get( MLT_PRODUCER_PROPERTIES( info.producer ), "title" ); + if ( title == NULL ) + title = strip_root( unit, info.resource ); + valerie_response_printf( response, 10240, "%d \"%s\" %d %d %d %d %.2f\n", i, - strip_root( unit, info.resource ), + title, info.frame_in, info.frame_out, info.frame_count, @@ -267,27 +268,31 @@ void miracle_unit_report_list( miracle_unit unit, valerie_response response ) \param out The ending frame (-1 for maximum) */ -valerie_error_code miracle_unit_load( miracle_unit unit, char *clip, int64_t in, int64_t out, int flush ) +valerie_error_code miracle_unit_load( miracle_unit unit, char *clip, int32_t in, int32_t out, int flush ) { - // Now try to create an producer - mlt_producer instance = create_producer( clip ); + // Now try to create a producer + mlt_producer instance = locate_producer( unit, clip ); if ( instance != NULL ) { - clear_unit( unit ); mlt_properties properties = unit->properties; - mlt_properties_set_data( unit->producers, clip, instance, 0, ( mlt_destructor )mlt_producer_close, NULL ); mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + int original = mlt_producer_get_playtime( MLT_PLAYLIST_PRODUCER( playlist ) ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append_io( playlist, instance, in, out ); + mlt_playlist_remove_region( playlist, 0, original ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "loaded clip %s", clip ); + update_generation( unit ); miracle_unit_status_communicate( unit ); + mlt_producer_close( instance ); return valerie_ok; } return valerie_invalid_file; } -valerie_error_code miracle_unit_insert( miracle_unit unit, char *clip, int index, int64_t in, int64_t out ) +valerie_error_code miracle_unit_insert( miracle_unit unit, char *clip, int index, int32_t in, int32_t out ) { mlt_producer instance = locate_producer( unit, clip ); @@ -296,10 +301,13 @@ valerie_error_code miracle_unit_insert( miracle_unit unit, char *clip, int index mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); fprintf( stderr, "inserting clip %s before %d\n", clip, index ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_insert( playlist, instance, index, in, out ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "inserted clip %s at %d", clip, index ); update_generation( unit ); miracle_unit_status_communicate( unit ); + mlt_producer_close( instance ); return valerie_ok; } @@ -310,7 +318,9 @@ valerie_error_code miracle_unit_remove( miracle_unit unit, int index ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_remove( playlist, index ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "removed clip at %d", index ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -325,11 +335,31 @@ valerie_error_code miracle_unit_clean( miracle_unit unit ) return valerie_ok; } +valerie_error_code miracle_unit_wipe( miracle_unit unit ) +{ + wipe_unit( unit ); + miracle_log( LOG_DEBUG, "Wiped playlist" ); + miracle_unit_status_communicate( unit ); + return valerie_ok; +} + +valerie_error_code miracle_unit_clear( miracle_unit unit ) +{ + mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); + clear_unit( unit ); + mlt_consumer_purge( consumer ); + miracle_log( LOG_DEBUG, "Cleared playlist" ); + miracle_unit_status_communicate( unit ); + return valerie_ok; +} + valerie_error_code miracle_unit_move( miracle_unit unit, int src, int dest ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_move( playlist, src, dest ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); miracle_log( LOG_DEBUG, "moved clip %d to %d", src, dest ); update_generation( unit ); miracle_unit_status_communicate( unit ); @@ -345,7 +375,7 @@ valerie_error_code miracle_unit_move( miracle_unit unit, int src, int dest ) \param out The ending frame (-1 for maximum) */ -valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int64_t in, int64_t out ) +valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int32_t in, int32_t out ) { mlt_producer instance = locate_producer( unit, clip ); @@ -353,16 +383,38 @@ valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int64_t i { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); mlt_playlist_append_io( playlist, instance, in, out ); miracle_log( LOG_DEBUG, "appended clip %s", clip ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_status_communicate( unit ); + mlt_producer_close( instance ); return valerie_ok; } return valerie_invalid_file; } +/** Add an mlt_service to the playlist + + \param unit A miracle_unit handle. + \param service the service to add +*/ + +valerie_error_code miracle_unit_append_service( miracle_unit unit, mlt_service service ) +{ + mlt_properties properties = unit->properties; + mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); + mlt_playlist_append( playlist, ( mlt_producer )service ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); + miracle_log( LOG_DEBUG, "appended clip" ); + update_generation( unit ); + miracle_unit_status_communicate( unit ); + return valerie_ok; +} + /** Start playing the unit. \todo error handling @@ -375,7 +427,7 @@ void miracle_unit_play( miracle_unit_t *unit, int speed ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); mlt_producer_set_speed( producer, ( double )speed / 1000 ); mlt_consumer_start( consumer ); @@ -393,7 +445,7 @@ void miracle_unit_terminate( miracle_unit unit ) { mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); mlt_playlist playlist = mlt_properties_get_data( unit->properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_producer_set_speed( producer, 0 ); mlt_consumer_stop( consumer ); miracle_unit_status_communicate( unit ); @@ -421,23 +473,35 @@ int miracle_unit_transfer( miracle_unit dest_unit, miracle_unit src_unit ) mlt_playlist dest_playlist = mlt_properties_get_data( dest_properties, "playlist", NULL ); mlt_properties src_properties = src_unit->properties; mlt_playlist src_playlist = mlt_properties_get_data( src_properties, "playlist", NULL ); + mlt_playlist tmp_playlist = mlt_playlist_init( ); for ( i = 0; i < mlt_playlist_count( src_playlist ); i ++ ) { mlt_playlist_clip_info info; mlt_playlist_get_clip_info( src_playlist, &info, i ); - mlt_producer producer = locate_producer( dest_unit, info.resource ); - if ( producer != NULL ) - { - mlt_playlist_append_io( dest_playlist, producer, info.frame_in, info.frame_out ); - if ( i == 0 ) - { - miracle_unit_change_position( dest_unit, mlt_playlist_count( dest_playlist ) - 1, 0 ); - clean_unit( dest_unit ); - } - } + if ( info.producer != NULL ) + mlt_playlist_append_io( tmp_playlist, info.producer, info.frame_in, info.frame_out ); + } + + clear_unit( src_unit ); + + mlt_service_lock( MLT_PLAYLIST_SERVICE( dest_playlist ) ); + + for ( i = 0; i < mlt_playlist_count( tmp_playlist ); i ++ ) + { + mlt_playlist_clip_info info; + mlt_playlist_get_clip_info( tmp_playlist, &info, i ); + if ( info.producer != NULL ) + mlt_playlist_append_io( dest_playlist, info.producer, info.frame_in, info.frame_out ); } + mlt_service_unlock( MLT_PLAYLIST_SERVICE( dest_playlist ) ); + + update_generation( dest_unit ); + miracle_unit_status_communicate( dest_unit ); + + mlt_playlist_close( tmp_playlist ); + return 0; } @@ -462,7 +526,7 @@ int miracle_unit_get_status( miracle_unit unit, valerie_status status ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_producer clip = mlt_playlist_current( playlist ); mlt_playlist_clip_info info; @@ -471,17 +535,20 @@ int miracle_unit_get_status( miracle_unit unit, valerie_status status ) if ( info.resource != NULL && strcmp( info.resource, "" ) ) { - strncpy( status->clip, strip_root( unit, info.resource ), sizeof( status->clip ) ); + char *title = mlt_properties_get( MLT_PRODUCER_PROPERTIES( info.producer ), "title" ); + if ( title == NULL ) + title = strip_root( unit, info.resource ); + strncpy( status->clip, title, sizeof( status->clip ) ); status->speed = (int)( mlt_producer_get_speed( producer ) * 1000.0 ); status->fps = mlt_producer_get_fps( producer ); status->in = info.frame_in; status->out = info.frame_out; - status->position = mlt_producer_position( clip ); + status->position = mlt_producer_frame( clip ); status->length = mlt_producer_get_length( clip ); - strncpy( status->tail_clip, strip_root( unit, info.resource ), sizeof( status->tail_clip ) ); + strncpy( status->tail_clip, title, sizeof( status->tail_clip ) ); status->tail_in = info.frame_in; status->tail_out = info.frame_out; - status->tail_position = mlt_producer_position( clip ); + status->tail_position = mlt_producer_frame( clip ); status->tail_length = mlt_producer_get_length( clip ); status->clip_index = mlt_playlist_current_clip( playlist ); status->seek_flag = 1; @@ -511,11 +578,11 @@ int miracle_unit_get_status( miracle_unit unit, valerie_status status ) /** Change position in the playlist. */ -void miracle_unit_change_position( miracle_unit unit, int clip, int64_t position ) +void miracle_unit_change_position( miracle_unit unit, int clip, int32_t position ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_playlist_clip_info info; if ( clip < 0 ) @@ -531,8 +598,8 @@ void miracle_unit_change_position( miracle_unit unit, int clip, int64_t position if ( mlt_playlist_get_clip_info( playlist, &info, clip ) == 0 ) { - int64_t frame_start = info.start; - int64_t frame_offset = position; + int32_t frame_start = info.start; + int32_t frame_offset = position; if ( frame_offset < 0 ) frame_offset = info.frame_out; @@ -561,7 +628,7 @@ int miracle_unit_get_current_clip( miracle_unit unit ) /** Set a clip's in point */ -int miracle_unit_set_clip_in( miracle_unit unit, int index, int64_t position ) +int miracle_unit_set_clip_in( miracle_unit unit, int index, int32_t position ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); @@ -571,7 +638,9 @@ int miracle_unit_set_clip_in( miracle_unit unit, int index, int64_t position ) if ( error == 0 ) { miracle_unit_play( unit, 0 ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); error = mlt_playlist_resize_clip( playlist, index, position, info.frame_out ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_change_position( unit, index, 0 ); } @@ -582,7 +651,7 @@ int miracle_unit_set_clip_in( miracle_unit unit, int index, int64_t position ) /** Set a clip's out point. */ -int miracle_unit_set_clip_out( miracle_unit unit, int index, int64_t position ) +int miracle_unit_set_clip_out( miracle_unit unit, int index, int32_t position ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); @@ -592,7 +661,9 @@ int miracle_unit_set_clip_out( miracle_unit unit, int index, int64_t position ) if ( error == 0 ) { miracle_unit_play( unit, 0 ); + mlt_service_lock( MLT_PLAYLIST_SERVICE( playlist ) ); error = mlt_playlist_resize_clip( playlist, index, info.frame_in, position ); + mlt_service_unlock( MLT_PLAYLIST_SERVICE( playlist ) ); update_generation( unit ); miracle_unit_status_communicate( unit ); miracle_unit_change_position( unit, index, -1 ); @@ -604,11 +675,11 @@ int miracle_unit_set_clip_out( miracle_unit unit, int index, int64_t position ) /** Step by specified position. */ -void miracle_unit_step( miracle_unit unit, int64_t offset ) +void miracle_unit_step( miracle_unit unit, int32_t offset ) { mlt_properties properties = unit->properties; mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL ); - mlt_producer producer = mlt_playlist_producer( playlist ); + mlt_producer producer = MLT_PLAYLIST_PRODUCER( playlist ); mlt_position position = mlt_producer_frame( producer ); mlt_producer_seek( producer, position + offset ); } @@ -659,12 +730,12 @@ int miracle_unit_set( miracle_unit unit, char *name_value ) if ( strncmp( name_value, "consumer.", 9 ) ) { mlt_playlist playlist = mlt_properties_get_data( unit->properties, "playlist", NULL ); - properties = mlt_playlist_properties( playlist ); + properties = MLT_PLAYLIST_PROPERTIES( playlist ); } else { mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL ); - properties = mlt_consumer_properties( consumer ); + properties = MLT_CONSUMER_PROPERTIES( consumer ); name_value += 9; } @@ -674,7 +745,7 @@ int miracle_unit_set( miracle_unit unit, char *name_value ) char *miracle_unit_get( miracle_unit unit, char *name ) { mlt_playlist playlist = mlt_properties_get_data( unit->properties, "playlist", NULL ); - mlt_properties properties = mlt_playlist_properties( playlist ); + mlt_properties properties = MLT_PLAYLIST_PROPERTIES( playlist ); return mlt_properties_get( properties, name ); } @@ -689,10 +760,8 @@ void miracle_unit_close( miracle_unit unit ) if ( unit != NULL ) { miracle_log( LOG_DEBUG, "closing unit..." ); - if ( unit->old_producers != NULL ) - mlt_properties_close( unit->old_producers ); + miracle_unit_terminate( unit ); mlt_properties_close( unit->properties ); - mlt_properties_close( unit->producers ); free( unit ); miracle_log( LOG_DEBUG, "... unit closed." ); }