X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=ef2760e95dd38bfa4d776d4ac93fe8316c8d549c;hb=a038d8a6f14b30dd52242d2f69601e6393e44475;hp=ac84f90ed158f55fa246a257d6544e0b4567b3b1;hpb=edfb53ebb1ce5b141e34b7feb7df7448cbc5be96;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index ac84f90..ef2760e 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -71,12 +71,38 @@ int mlt_consumer_init( mlt_consumer this, void *child ) // Default read ahead buffer size mlt_properties_set_int( properties, "buffer", 25 ); + // Default audio frequency and channels + mlt_properties_set_int( properties, "frequency", 48000 ); + mlt_properties_set_int( properties, "channels", 2 ); + + // Default of all consumers is real time + mlt_properties_set_int( properties, "real_time", 1 ); + + // Default to environment test card + mlt_properties_set( properties, "test_card", mlt_environment( "MLT_TEST_CARD" ) ); + // Hmm - default all consumers to yuv422 :-/ this->format = mlt_image_yuv422; } return error; } +/** Create a new consumer. +*/ + +mlt_consumer mlt_consumer_new( ) +{ + // Create the memory for the structure + mlt_consumer this = malloc( sizeof( struct mlt_consumer_s ) ); + + // Initialise it + if ( this != NULL ) + mlt_consumer_init( this, NULL ); + + // Return it + return this; +} + /** Get the parent service object. */ @@ -118,8 +144,7 @@ int mlt_consumer_start( mlt_consumer this ) if ( mlt_properties_get_data( properties, "test_card_producer", NULL ) == NULL ) { // Create a test card producer - // TODO: do we want to use fezzik here? - mlt_producer producer = mlt_factory_producer( "fezzik", test_card ); + mlt_producer producer = mlt_factory_producer( NULL, test_card ); // Do we have a producer if ( producer != NULL ) @@ -142,6 +167,9 @@ int mlt_consumer_start( mlt_consumer this ) mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); } + // Set the real_time preference + this->real_time = mlt_properties_get_int( properties, "real_time" ); + // Start the service if ( this->start != NULL ) return this->start( this ); @@ -149,7 +177,7 @@ int mlt_consumer_start( mlt_consumer this ) return 0; } -/** Protected method :-/ for consumer to get frames from connected service +/** Protected method for consumer to get frames from connected service */ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) @@ -206,6 +234,8 @@ static void *consumer_read_ahead_thread( void *arg ) // Get the properties of the consumer mlt_properties properties = mlt_consumer_properties( this ); + char *service = mlt_properties_get( properties, "mlt_service" ); + // Get the width and height int width = mlt_properties_get_int( properties, "width" ); int height = mlt_properties_get_int( properties, "height" ); @@ -222,6 +252,7 @@ static void *consumer_read_ahead_thread( void *arg ) // Average time for get_frame and get_image int count = 1; + int skipped = 0; int64_t time_wait = 0; int64_t time_frame = 0; int64_t time_image = 0; @@ -240,13 +271,14 @@ 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 ); @@ -255,13 +287,46 @@ static void *consumer_read_ahead_thread( void *arg ) // Increment the count count ++; + // All non normal playback frames should be shown + if ( mlt_properties_get_int( mlt_frame_properties( frame ), "_speed" ) != 1 ) + { + skipped = 0; + time_frame = 0; + time_image = 0; + time_wait = 0; + count = 1; + } + + //fprintf( stderr, "%s: %d %d %lld %lld\n", service, mlt_deque_count( this->queue ), buffer, ( time_frame + time_image ) / count, ( time_wait / count ) ); + // Get the image - if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) ) + if ( ( time_frame + time_image ) / 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 ); + + // Reset the skipped count + skipped = 0; + } + else + { + fprintf( stderr, "Dropped a frame for %s\n", service ); + + // Increment the number of sequentially skipped frames + skipped ++; + + time_wait = 0; + + // If we've reached an unacceptable level, reset everything + if ( skipped > 10 ) + { + skipped = 0; + time_frame = 0; + time_image = 0; + count = 0; + } } } @@ -273,6 +338,8 @@ static void *consumer_read_ahead_thread( void *arg ) static void consumer_read_ahead_start( mlt_consumer this ) { + pthread_attr_t thread_attributes; + // We're running now this->ahead = 1; @@ -285,9 +352,12 @@ static void consumer_read_ahead_start( mlt_consumer this ) // Create the condition pthread_cond_init( &this->cond, NULL ); + // Inherit the scheduling priority + pthread_attr_init( &thread_attributes ); + pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + // Create the read ahead - pthread_create( &this->ahead_thread, NULL, consumer_read_ahead_thread, this ); - + pthread_create( &this->ahead_thread, &thread_attributes, consumer_read_ahead_thread, this ); } static void consumer_read_ahead_stop( mlt_consumer this ) @@ -315,6 +385,9 @@ static void consumer_read_ahead_stop( mlt_consumer this ) // Wipe the queue while ( mlt_deque_count( this->queue ) ) mlt_frame_close( mlt_deque_pop_back( this->queue ) ); + + // Close the queue + mlt_deque_close( this->queue ); } } @@ -322,24 +395,40 @@ 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 ) + // Get the properties + mlt_properties properties = mlt_consumer_properties( this ); + + // Check if the user has requested real time or not + if ( this->real_time ) { - int buffer = mlt_properties_get_int( mlt_consumer_properties( this ), "buffer" ); - consumer_read_ahead_start( this ); - if ( buffer > 1 ) - size = buffer / 2; + int size = 1; + + // Is the read ahead running? + if ( this->ahead == 0 ) + { + int buffer = mlt_properties_get_int( properties, "buffer" ); + consumer_read_ahead_start( this ); + if ( buffer > 1 ) + size = buffer; + } + + // 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 ); } + else + { + // Get the frame in non real time + frame = mlt_consumer_get_frame( this ); - // 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 ); + // This isn't true, but from the consumers perspective it is + mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); + } return frame; } @@ -356,8 +445,9 @@ int mlt_consumer_stop( mlt_consumer this ) if ( this->stop != NULL ) this->stop( this ); - // Kill the read ahead - consumer_read_ahead_stop( this ); + // Check if the user has requested real time or not and stop if necessary + if ( mlt_properties_get_int( properties, "real_time" ) ) + consumer_read_ahead_stop( this ); // Kill the test card mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );