X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=268a5e60708fcb4d9e7697ebb75ef8a9eb275152;hb=7cef152403bfa0ea30e4a3e102fe33bc75e508ab;hp=652698f968a60476111ce1a37591a2e9e3890000;hpb=4db14da139d0cce1807d5f3530b271238786b795;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 652698f..268a5e6 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -28,6 +28,8 @@ #include #include +static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ); + /** Public final methods */ @@ -83,10 +85,24 @@ int mlt_consumer_init( mlt_consumer this, void *child ) // Hmm - default all consumers to yuv422 :-/ this->format = mlt_image_yuv422; + + mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show ); + mlt_events_register( properties, "consumer-stopped", NULL ); + + // Create the push mutex and condition + pthread_mutex_init( &this->put_mutex, NULL ); + pthread_cond_init( &this->put_cond, NULL ); + } return error; } +static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( mlt_frame )args[ 0 ] ); +} + /** Create a new consumer. */ @@ -177,6 +193,37 @@ int mlt_consumer_start( mlt_consumer this ) return 0; } +/** An alternative method to feed frames into the consumer - only valid if + the consumer itself is not connected. +*/ + +int mlt_consumer_put_frame( mlt_consumer this, mlt_frame frame ) +{ + int error = 1; + + // Get the service assoicated to the consumer + mlt_service service = mlt_consumer_service( this ); + + if ( mlt_service_producer( service ) == NULL ) + { + pthread_mutex_lock( &this->put_mutex ); + if ( this->put != NULL ) + pthread_cond_wait( &this->put_cond, &this->put_mutex ); + if ( this->put == NULL ) + this->put = frame; + else + mlt_frame_close( frame ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + } + else + { + mlt_frame_close( frame ); + } + + return error; +} + /** Protected method for consumer to get frames from connected service */ @@ -188,12 +235,25 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Get the service assoicated to the consumer mlt_service service = mlt_consumer_service( this ); + // Get the consumer properties + mlt_properties properties = mlt_consumer_properties( this ); + // Get the frame - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + if ( mlt_service_producer( service ) == NULL && mlt_properties_get_int( properties, "put_mode" ) ) { - // Get the consumer properties - mlt_properties properties = mlt_consumer_properties( this ); + pthread_mutex_lock( &this->put_mutex ); + if ( this->put == NULL ) + pthread_cond_wait( &this->put_cond, &this->put_mutex ); + frame = this->put; + this->put = NULL; + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + if ( frame != NULL ) + mlt_service_apply_filters( service, frame, 0 ); + } + if ( frame != NULL || mlt_service_get_frame( service, &frame, 0 ) == 0 ) + { // Get the frame properties mlt_properties frame_properties = mlt_frame_properties( frame ); @@ -209,8 +269,8 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Aspect ratio and other jiggery pokery mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) ); - mlt_properties_set_int( frame_properties, "consumer_progressive", mlt_properties_get_int( properties, "progressive" ) ); - mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "deinterlace" ) ); + if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) ) + mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 ); } // Return the frame @@ -404,6 +464,11 @@ static void consumer_read_ahead_stop( mlt_consumer this ) pthread_cond_broadcast( &this->cond ); pthread_mutex_unlock( &this->mutex ); + // Broadcast to the put condition in case it's waiting + pthread_mutex_lock( &this->put_mutex ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + // Join the thread pthread_join( this->ahead_thread, NULL ); @@ -422,6 +487,18 @@ static void consumer_read_ahead_stop( mlt_consumer this ) } } +void mlt_consumer_purge( mlt_consumer this ) +{ + if ( this->ahead ) + { + pthread_mutex_lock( &this->mutex ); + while ( mlt_deque_count( this->queue ) ) + mlt_frame_close( mlt_deque_pop_back( this->queue ) ); + pthread_cond_broadcast( &this->cond ); + pthread_mutex_unlock( &this->mutex ); + } +} + mlt_frame mlt_consumer_rt_frame( mlt_consumer this ) { // Frame to return @@ -439,9 +516,10 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this ) if ( this->ahead == 0 ) { int buffer = mlt_properties_get_int( properties, "buffer" ); + int prefill = mlt_properties_get_int( properties, "prefill" ); consumer_read_ahead_start( this ); if ( buffer > 1 ) - size = buffer; + size = prefill > 0 && prefill < buffer ? prefill : buffer; } // Get frame from queue @@ -464,6 +542,15 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this ) return frame; } +/** Callback for the implementation to indicate a stopped condition. +*/ + +void mlt_consumer_stopped( mlt_consumer this ) +{ + mlt_properties_set_int( mlt_consumer_properties( this ), "running", 0 ); + mlt_events_fire( mlt_consumer_properties( this ), "consumer-stopped", NULL ); +} + /** Stop the consumer. */ @@ -480,6 +567,11 @@ int mlt_consumer_stop( mlt_consumer this ) if ( mlt_properties_get_int( properties, "real_time" ) ) consumer_read_ahead_stop( this ); + // Just in case... + pthread_mutex_lock( &this->put_mutex ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + // Kill the test card mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); @@ -487,6 +579,12 @@ int mlt_consumer_stop( mlt_consumer this ) if ( mlt_properties_get( properties, "post" ) ) system( mlt_properties_get( properties, "post" ) ); + if ( this->put != NULL ) + { + mlt_frame_close( this->put ); + this->put = NULL; + } + return 0; } @@ -507,15 +605,24 @@ int mlt_consumer_is_stopped( mlt_consumer this ) void mlt_consumer_close( mlt_consumer this ) { - // Get the childs close function - void ( *consumer_close )( ) = this->close; + if ( this != NULL && mlt_properties_dec_ref( mlt_consumer_properties( this ) ) <= 0 ) + { + // Get the childs close function + void ( *consumer_close )( ) = this->close; - // Make sure it only gets called once - this->close = NULL; + // Make sure it only gets called once + this->close = NULL; + this->parent.close = NULL; - // Call the childs close if available - if ( consumer_close != NULL ) - consumer_close( this ); - else - mlt_service_close( &this->parent ); + // Destroy the push mutex and condition + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_destroy( &this->put_mutex ); + pthread_cond_destroy( &this->put_cond ); + + // Call the childs close if available + if ( consumer_close != NULL ) + consumer_close( this ); + else + mlt_service_close( &this->parent ); + } }