X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=a04863de8da909f66741fbdb88e889e45b4ad5f7;hb=a01e64529a0e9d097bce26715a45fd4bb3de3538;hp=8d79fc7d6eb6c7231d739c308d2ada68201b8690;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 8d79fc7..a04863d 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" ) ) @@ -61,10 +62,18 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_int( properties, "height", 480 ); mlt_properties_set_int( properties, "progressive", 0 ); } + + // Default aspect ratio mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 ); // Default rescaler for all consumers mlt_properties_set( properties, "rescale", "bilinear" ); + + // Default read ahead buffer size + mlt_properties_set_int( properties, "buffer", 25 ); + + // Hmm - default all consumers to yuv422 :-/ + this->format = mlt_image_yuv422; } return error; } @@ -128,6 +137,11 @@ int mlt_consumer_start( mlt_consumer this ) 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 ) @@ -156,25 +170,181 @@ 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" ) ); // 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" ); + + // Get the maximum size of the buffer + int buffer = mlt_properties_get_int( properties, "buffer" ); + + // 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 + frame = mlt_consumer_get_frame( this ); + + // 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 ); + + // Get the starting time (can ignore the times above) + gettimeofday( &ante, NULL ); + + // 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 ) >= 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 ); + + // 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 ) / count < ( 40000 - ( time_wait / count ) ) ) + { + // 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 ); + } + } + + // 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 ) +{ + // Frame to return + mlt_frame frame = NULL; + int size = 1; + + // Is the read ahead running? + if ( this->ahead == 0 ) + { + int buffer = mlt_properties_get_int( mlt_consumer_properties( this ), "buffer" ); + consumer_read_ahead_start( this ); + if ( buffer > 1 ) + size = buffer / 2; + } + + // 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. */ @@ -187,6 +357,9 @@ int mlt_consumer_stop( mlt_consumer this ) if ( this->stop != NULL ) 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 );