X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=b904f13796f1a29bd7e87af357bd6d77e8a3822c;hb=2e467c2eeba2b51aecddda21d4bb97bef4cd1459;hp=92d1927cace13f7bb8f1486c1fccd9c106937712;hpb=0cbaf64858fe0e9e11b5b14691ff11b7ca8e9027;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 92d1927..b904f13 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 */ @@ -53,7 +55,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 576 ); mlt_properties_set_int( properties, "progressive", 0 ); - mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); } else { @@ -62,7 +64,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 480 ); mlt_properties_set_int( properties, "progressive", 0 ); - mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); } // Default rescaler for all consumers @@ -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. */ @@ -108,7 +124,7 @@ mlt_consumer mlt_consumer_new( ) mlt_service mlt_consumer_service( mlt_consumer this ) { - return &this->parent; + return this != NULL ? &this->parent : NULL; } /** Get the consumer properties. @@ -116,7 +132,7 @@ mlt_service mlt_consumer_service( mlt_consumer this ) mlt_properties mlt_consumer_properties( mlt_consumer this ) { - return mlt_service_properties( &this->parent ); + return this != NULL ? mlt_service_properties( &this->parent ) : NULL; } /** Connect the consumer to the producer. @@ -138,6 +154,10 @@ int mlt_consumer_start( mlt_consumer this ) // Determine if there's a test card producer char *test_card = mlt_properties_get( properties, "test_card" ); + // Just to make sure nothing is hanging around... + mlt_frame_close( this->put ); + this->put = NULL; + // Deal with it now. if ( test_card != NULL ) { @@ -150,15 +170,13 @@ int mlt_consumer_start( mlt_consumer this ) if ( producer != NULL ) { // Test card should loop I guess... - mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); + mlt_properties_set( mlt_producer_properties( producer ), "eof", "pause" ); + mlt_producer_set_speed( producer, 0 ); + mlt_producer_set_in_and_out( producer, 0, 0 ); // Set the test card on the consumer mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); } - - // Check and run an ante command - if ( mlt_properties_get( properties, "ante" ) ) - system( mlt_properties_get( properties, "ante" ) ); } } else @@ -167,6 +185,10 @@ int mlt_consumer_start( mlt_consumer this ) mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); } + // Check and run an ante command + if ( mlt_properties_get( properties, "ante" ) ) + system( mlt_properties_get( properties, "ante" ) ); + // Set the real_time preference this->real_time = mlt_properties_get_int( properties, "real_time" ); @@ -177,6 +199,44 @@ 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 ) + { + struct timeval now; + struct timespec tm; + pthread_mutex_lock( &this->put_mutex ); + while ( !mlt_consumer_is_stopped( this ) && this->put != NULL ) + { + gettimeofday( &now, NULL ); + tm.tv_sec = now.tv_sec + 1; + tm.tv_nsec = now.tv_usec * 1000; + pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm ); + } + 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 +248,36 @@ 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" ) ) + { + struct timeval now; + struct timespec tm; + pthread_mutex_lock( &this->put_mutex ); + while ( !mlt_consumer_is_stopped( this ) && this->put == NULL ) + { + gettimeofday( &now, NULL ); + tm.tv_sec = now.tv_sec + 1; + tm.tv_nsec = now.tv_usec * 1000; + pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm ); + } + 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 ); + } + else if ( mlt_service_producer( service ) != NULL ) { - // Get the consumer properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_service_get_frame( service, &frame, 0 ); + } + if ( frame != NULL ) + { // Get the frame properties mlt_properties frame_properties = mlt_frame_properties( frame ); @@ -209,8 +293,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 @@ -268,7 +352,8 @@ static void *consumer_read_ahead_thread( void *arg ) int skipped = 0; int64_t time_wait = 0; int64_t time_frame = 0; - int64_t time_image = 0; + int64_t time_process = 0; + int skip_next = 0; // Get the first frame frame = mlt_consumer_get_frame( this ); @@ -293,19 +378,23 @@ static void *consumer_read_ahead_thread( void *arg ) while ( this->ahead ) { // Put the current frame into the queue - time_difference( &ante ); pthread_mutex_lock( &this->mutex ); while( this->ahead && mlt_deque_count( this->queue ) >= buffer ) pthread_cond_wait( &this->cond, &this->mutex ); mlt_deque_push_back( this->queue, frame ); pthread_cond_broadcast( &this->cond ); pthread_mutex_unlock( &this->mutex ); - time_wait = time_difference( &ante ); + + time_wait += time_difference( &ante ); // Get the next frame frame = mlt_consumer_get_frame( this ); time_frame += time_difference( &ante ); + // If there's no frame, we're probably stopped... + if ( frame == NULL ) + continue; + // Increment the count count ++; @@ -314,33 +403,34 @@ static void *consumer_read_ahead_thread( void *arg ) { skipped = 0; time_frame = 0; - time_image = 0; + time_process = 0; + time_wait = 0; count = 1; + skip_next = 0; } // Get the image - if ( ( time_frame + time_image ) / count < 40000 ) + if ( !skip_next ) { // Get the image, mark as rendered and time it if ( !video_off ) mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 ); mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); - - // Reset the skipped count - skipped = 0; } else { // Increment the number of sequentially skipped frames skipped ++; + skip_next = 0; // If we've reached an unacceptable level, reset everything - if ( skipped > 10 ) + if ( skipped > 5 ) { skipped = 0; time_frame = 0; - time_image = 0; - count = 0; + time_process = 0; + time_wait = 0; + count = 1; } } @@ -353,7 +443,11 @@ static void *consumer_read_ahead_thread( void *arg ) } // Increment the time take for this frame - time_image += time_difference( &ante ); + time_process += time_difference( &ante ); + + // Determine if the next frame should be skipped + if ( mlt_deque_count( this->queue ) <= 5 && ( ( time_wait + time_frame + time_process ) / count ) > 40000 ) + skip_next = 1; } // Remove the last frame @@ -399,6 +493,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 ); @@ -417,6 +516,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 @@ -434,9 +545,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 @@ -453,12 +565,22 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this ) frame = mlt_consumer_get_frame( this ); // This isn't true, but from the consumers perspective it is - mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); + if ( frame != NULL ) + mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); } 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. */ @@ -475,6 +597,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 ); @@ -482,6 +609,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; } @@ -502,15 +635,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 ); + } }