X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Fconsumer_multi.c;h=ffcc608619a7bc4b50967861c72efe769bb2cd5e;hb=45e92efd45d245cc9fb778db5a1ea340d5319336;hp=03a849ea268fc7c0d8364f2560574377a8e33880;hpb=a73c4ea1eecc6373446b00338e3c751d9fb56746;p=mlt diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c index 03a849ea..ffcc6086 100644 --- a/src/modules/core/consumer_multi.c +++ b/src/modules/core/consumer_multi.c @@ -30,6 +30,7 @@ static int stop( mlt_consumer consumer ); static int is_stopped( mlt_consumer consumer ); static void *consumer_thread( void *arg ); static void consumer_close( mlt_consumer consumer ); +static void purge( mlt_consumer consumer ); static mlt_properties normalisers = NULL; @@ -57,6 +58,7 @@ mlt_consumer consumer_multi_init( mlt_profile profile, mlt_service_type type, co consumer->start = start; consumer->stop = stop; consumer->is_stopped = is_stopped; + consumer->purge = purge; } return consumer; @@ -83,17 +85,27 @@ static void create_filter( mlt_profile profile, mlt_service service, char *effec if ( arg != NULL ) *arg ++ = '\0'; - // The swscale and avcolor_space filters require resolution as arg to test compatibility - if ( strncmp( effect, "swscale", 7 ) == 0 || strncmp( effect, "avcolo", 6 ) == 0 ) - arg = (char*) mlt_properties_get_int( MLT_SERVICE_PROPERTIES( service ), "meta.media.width" ); - - mlt_filter filter = mlt_factory_filter( profile, id, arg ); - if ( filter != NULL ) + // We cannot use GLSL-based filters here. + if ( strncmp( effect, "movit.", 6 ) && strncmp( effect, "glsl.", 5 ) ) { - mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 ); - mlt_service_attach( service, filter ); - mlt_filter_close( filter ); - *created = 1; + mlt_filter filter; + // The swscale and avcolor_space filters require resolution as arg to test compatibility + if ( strncmp( effect, "swscale", 7 ) == 0 || strncmp( effect, "avcolo", 6 ) == 0 ) + { + int width = mlt_properties_get_int( MLT_SERVICE_PROPERTIES( service ), "meta.media.width" ); + filter = mlt_factory_filter( profile, id, &width ); + } + else + { + filter = mlt_factory_filter( profile, id, arg ); + } + if ( filter ) + { + mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 ); + mlt_service_attach( service, filter ); + mlt_filter_close( filter ); + *created = 1; + } } free( id ); } @@ -131,12 +143,27 @@ static void attach_normalisers( mlt_profile profile, mlt_service service ) // Attach the audio and video format converters int created = 0; + // movit.convert skips setting the frame->convert_image pointer if GLSL cannot be used. + mlt_filter filter = mlt_factory_filter( profile, "movit.convert", NULL ); + if ( filter != NULL ) + { + mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 ); + mlt_service_attach( service, filter ); + mlt_filter_close( filter ); + created = 1; + } + // avcolor_space and imageconvert only set frame->convert_image if it has not been set. create_filter( profile, service, "avcolor_space", &created ); if ( !created ) create_filter( profile, service, "imageconvert", &created ); create_filter( profile, service, "audioconvert", &created ); } +static void on_frame_show( void *dummy, mlt_properties properties, mlt_frame frame ) +{ + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); +} + static mlt_consumer generate_consumer( mlt_consumer consumer, mlt_properties props, int index ) { mlt_profile profile = NULL; @@ -166,6 +193,14 @@ static mlt_consumer generate_consumer( mlt_consumer consumer, mlt_properties pro mlt_properties_inherit( nested_props, props ); attach_normalisers( profile, MLT_CONSUMER_SERVICE(nested) ); + + // Relay the first available consumer-frame-show event + mlt_event event = mlt_properties_get_data( properties, "frame-show-event", NULL ); + if ( !event ) + { + event = mlt_events_listen( nested_props, properties, "consumer-frame-show", (mlt_listener) on_frame_show ); + mlt_properties_set_data( properties, "frame-show-event", event, 0, /*mlt_event_close*/ NULL, NULL ); + } } else { @@ -328,7 +363,9 @@ static void foreach_consumer_put( mlt_consumer consumer, mlt_frame frame ) while ( nested_time <= self_time ) { // put ideal number of samples into cloned frame - mlt_frame clone_frame = mlt_frame_clone( frame, 0 ); + int deeply = index > 1 ? 1 : 0; + mlt_frame clone_frame = mlt_frame_clone( frame, deeply ); + mlt_properties clone_props = MLT_FRAME_PROPERTIES( clone_frame ); int nested_samples = mlt_sample_calculator( nested_fps, frequency, nested_pos ); // -10 is an optimization to avoid tiny amounts of leftover samples nested_samples = nested_samples > current_samples - 10 ? current_samples : nested_samples; @@ -344,15 +381,21 @@ static void foreach_consumer_put( mlt_consumer consumer, mlt_frame frame ) nested_size = 0; } mlt_frame_set_audio( clone_frame, prev_buffer, format, nested_size, mlt_pool_release ); - mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_samples", nested_samples ); - mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_frequency", frequency ); - mlt_properties_set_int( MLT_FRAME_PROPERTIES(clone_frame), "audio_channels", channels ); + mlt_properties_set_int( clone_props, "audio_samples", nested_samples ); + mlt_properties_set_int( clone_props, "audio_frequency", frequency ); + mlt_properties_set_int( clone_props, "audio_channels", channels ); // chomp the audio current_samples -= nested_samples; current_size -= nested_size; buffer += nested_size; + // Fix some things + mlt_properties_set_int( clone_props, "meta.media.width", + mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "width" ) ); + mlt_properties_set_int( clone_props, "meta.media.height", + mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "height" ) ); + // send frame to nested consumer mlt_consumer_put_frame( nested, clone_frame ); mlt_properties_set_position( nested_props, "_multi_position", ++nested_pos ); @@ -473,6 +516,27 @@ static int is_stopped( mlt_consumer consumer ) return !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "running" ); } +/** Purge each of the child consumers. +*/ + +static void purge( mlt_consumer consumer ) +{ + mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); + if ( mlt_properties_get_int( properties, "running" ) ) + { + mlt_consumer nested = NULL; + char key[30]; + int index = 0; + + do { + snprintf( key, sizeof(key), "%d.consumer", index++ ); + nested = mlt_properties_get_data( properties, key, NULL ); + if ( nested ) + mlt_consumer_purge( nested ); + } while ( nested ); + } +} + /** The main thread - the argument is simply the consumer. */ @@ -504,7 +568,6 @@ static void *consumer_thread( void *arg ) if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES(frame), "_speed" ) == 0 ) foreach_consumer_refresh( consumer ); foreach_consumer_put( consumer, frame ); - mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); } else { @@ -520,7 +583,6 @@ static void *consumer_thread( void *arg ) { // Send this termination frame to nested consumers for their cancellation foreach_consumer_put( consumer, frame ); - mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); } if ( frame ) mlt_frame_close( frame );