X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=5845d516a7a8518e44ecc67e433d1da4bea91779;hb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;hp=f0e21e338071d1751d1204e8c968e78d0cb8e2bb;hpb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index f0e21e3..5845d51 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -26,6 +26,7 @@ #include #include #include +#include /** Public final methods */ @@ -42,7 +43,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties properties = mlt_service_properties( &this->parent ); // Get the normalisation preference - char *normalisation = getenv( "MLT_NORMALISATION" ); + char *normalisation = mlt_environment( "MLT_NORMALISATION" ); // Deal with normalisation if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) @@ -51,6 +52,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_double( properties, "fps", 25.0 ); mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 576 ); + mlt_properties_set_int( properties, "progressive", 0 ); } else { @@ -58,7 +60,9 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); 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", 4.0 / 3.0 ); // Default rescaler for all consumers mlt_properties_set( properties, "rescale", "bilinear" ); @@ -104,16 +108,32 @@ int mlt_consumer_start( mlt_consumer this ) // Deal with it now. if ( test_card != NULL ) { - // Create a test card producer - mlt_producer producer = mlt_factory_producer( "fezzik", test_card ); - - // Do we have a producer - if ( producer != NULL ) + if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL ) { - // Set the test card on the consumer - mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); + // Create a test card producer + // TODO: do we want to use fezzik here? + mlt_producer producer = mlt_factory_producer( "fezzik", test_card ); + + // Do we have a producer + if ( producer != NULL ) + { + // Test card should loop I guess... + mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); + + // 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 + { + // Allow the hash table to speed things up + mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); + } // Start the service if ( this->start != NULL ) @@ -142,28 +162,206 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Get the frame properties mlt_properties frame_properties = mlt_frame_properties( frame ); - // Attach the test frame producer to it. + // Get the test card producer mlt_producer test_card = mlt_properties_get_data( properties, "test_card_producer", NULL ); - mlt_properties_set_data( frame_properties, "test_card_producer", test_card, 0, NULL, NULL ); + + // Attach the test frame producer to it. + if ( test_card != NULL ) + mlt_properties_set_data( frame_properties, "test_card_producer", test_card, 0, NULL, NULL ); // Attach the rescale property - if ( mlt_properties_get( properties, "rescale" ) != NULL ) - mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale" ) ); + mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale" ) ); - // TODO: Aspect ratio and other jiggery pokery + // 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" ) ); } // Return the frame return frame; } +static inline long time_difference( struct timeval *time1 ) +{ + struct timeval time2; + time2.tv_sec = time1->tv_sec; + time2.tv_usec = time1->tv_usec; + gettimeofday( time1, NULL ); + return time1->tv_sec * 1000000 + time1->tv_usec - time2.tv_sec * 1000000 - time2.tv_usec; +} + +static void *consumer_read_ahead_thread( void *arg ) +{ + // The argument is the consumer + mlt_consumer this = arg; + + // Get the properties of the consumer + mlt_properties properties = mlt_consumer_properties( this ); + + // Get the width and height + int width = mlt_properties_get_int( properties, "width" ); + int height = mlt_properties_get_int( properties, "height" ); + + // General frame variable + mlt_frame frame = NULL; + uint8_t *image = NULL; + + // Time structures + struct timeval ante; + + // Average time for get_frame and get_image + int count = 1; + int64_t time_wait = 0; + int64_t time_frame = 0; + int64_t time_image = 0; + + // Get the first frame + gettimeofday( &ante, NULL ); + frame = mlt_consumer_get_frame( this ); + time_frame = time_difference( &ante ); + + // Get the image of the first frame + mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 ); + mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); + time_image = time_difference( &ante ); + + // Continue to read ahead + while ( this->ahead ) + { + // Put the current frame into the queue + pthread_mutex_lock( &this->mutex ); + while( this->ahead && mlt_deque_count( this->queue ) >= 25 ) + 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 ); + + // Get the next frame + frame = mlt_consumer_get_frame( this ); + time_frame += time_difference( &ante ); + + // Increment the count + count ++; + + // Get the image + if ( ( time_frame + time_image + time_wait ) / count < 40000 ) + { + // Get the image, mark as rendered and time it + mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 ); + mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); + time_image += time_difference( &ante ); + } + else + { + // This is wrong, but it avoids slower machines getting starved + // It is, after all, impossible to go back in time :-/ + time_image -= ( time_image / count / 8 ); + } + } + + // Remove the last frame + mlt_frame_close( frame ); + + return NULL; +} + +static void consumer_read_ahead_start( mlt_consumer this ) +{ + // We're running now + this->ahead = 1; + + // Create the frame queue + this->queue = mlt_deque_init( ); + + // Create the mutex + pthread_mutex_init( &this->mutex, NULL ); + + // Create the condition + pthread_cond_init( &this->cond, NULL ); + + // Create the read ahead + pthread_create( &this->ahead_thread, NULL, consumer_read_ahead_thread, this ); + +} + +static void consumer_read_ahead_stop( mlt_consumer this ) +{ + // Make sure we're running + if ( this->ahead ) + { + // Inform thread to stop + this->ahead = 0; + + // Broadcast to the condition in case it's waiting + pthread_mutex_lock( &this->mutex ); + pthread_cond_broadcast( &this->cond ); + pthread_mutex_unlock( &this->mutex ); + + // Join the thread + pthread_join( this->ahead_thread, NULL ); + + // Destroy the mutex + pthread_mutex_destroy( &this->mutex ); + + // Destroy the condition + pthread_cond_destroy( &this->cond ); + + // Wipe the queue + while ( mlt_deque_count( this->queue ) ) + mlt_frame_close( mlt_deque_pop_back( this->queue ) ); + } +} + +mlt_frame mlt_consumer_rt_frame( mlt_consumer this, mlt_image_format format ) +{ + // Frame to return + mlt_frame frame = NULL; + int size = 1; + + + // Is the read ahead running? + if ( this->ahead == 0 ) + { + this->format = format; + consumer_read_ahead_start( this ); + size = 12; + } + + // Get frame from queue + pthread_mutex_lock( &this->mutex ); + while( this->ahead && mlt_deque_count( this->queue ) < size ) + pthread_cond_wait( &this->cond, &this->mutex ); + frame = mlt_deque_pop_front( this->queue ); + pthread_cond_broadcast( &this->cond ); + pthread_mutex_unlock( &this->mutex ); + + return frame; +} + /** Stop the consumer. */ int mlt_consumer_stop( mlt_consumer this ) { + // Get the properies + mlt_properties properties = mlt_consumer_properties( this ); + + // Stop the consumer if ( this->stop != NULL ) - return this->stop( this ); + this->stop( this ); + + // Kill the read ahead + consumer_read_ahead_stop( this ); + + // Kill the test card + mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); + + // Check and run a post command + if ( mlt_properties_get( properties, "post" ) ) + system( mlt_properties_get( properties, "post" ) ); + return 0; } @@ -172,16 +370,10 @@ int mlt_consumer_stop( mlt_consumer this ) int mlt_consumer_is_stopped( mlt_consumer this ) { - // Get the properies - mlt_properties properties = mlt_consumer_properties( this ); - - // Stop the consumer + // Check if the consumer is stopped if ( this->is_stopped != NULL ) return this->is_stopped( this ); - // Kill the test card - mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); - return 0; }