X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=2d039bdbf9aa70eb7d02a3f68615f79c94c0c398;hb=eccf04749681f70957f34fdd6742224774e72d15;hp=99ca1516d8fcf40240aaaff62355b1cddc7bdfa8;hpb=da46016cc4e9c751ab346b9b8f451a59cd276b03;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 99ca151..2d039bd 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -28,6 +28,7 @@ #include #include +static void mlt_consumer_frame_render( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ); static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ); /** Public final methods @@ -52,19 +53,33 @@ int mlt_consumer_init( mlt_consumer this, void *child ) { mlt_properties_set( properties, "normalisation", "PAL" ); mlt_properties_set_double( properties, "fps", 25.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 25 ); + mlt_properties_set_int( properties, "frame_rate_den", 1 ); 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", 59.0 / 54.0 ); + mlt_properties_set_int( properties, "aspect_ratio_num", 59 ); + mlt_properties_set_int( properties, "aspect_ratio_den", 54 ); + mlt_properties_set_double( properties, "display_ratio", 4.0 / 3.0 ); + mlt_properties_set_int( properties, "display_ratio_num", 4 ); + mlt_properties_set_int( properties, "display_ratio_den", 3 ); } else { mlt_properties_set( properties, "normalisation", "NTSC" ); mlt_properties_set_double( properties, "fps", 30000.0 / 1001.0 ); + mlt_properties_set_int( properties, "frame_rate_num", 30000 ); + mlt_properties_set_int( properties, "frame_rate_den", 1001 ); 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", 10.0 / 11.0 ); + mlt_properties_set_int( properties, "aspect_ratio_num", 10 ); + mlt_properties_set_int( properties, "aspect_ratio_den", 11 ); + mlt_properties_set_double( properties, "display_ratio", 4.0 / 3.0 ); + mlt_properties_set_int( properties, "display_ratio_num", 4 ); + mlt_properties_set_int( properties, "display_ratio_den", 3 ); } // Default rescaler for all consumers @@ -87,6 +102,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) this->format = mlt_image_yuv422; mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show ); + mlt_events_register( properties, "consumer-frame-render", ( mlt_transmitter )mlt_consumer_frame_render ); mlt_events_register( properties, "consumer-stopped", NULL ); // Create the push mutex and condition @@ -103,6 +119,12 @@ static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner listener( owner, this, ( mlt_frame )args[ 0 ] ); } +static void mlt_consumer_frame_render( 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. */ @@ -154,9 +176,20 @@ int mlt_consumer_start( mlt_consumer this ) // Determine if there's a test card producer char *test_card = mlt_properties_get( properties, "test_card" ); + // Handle profiles + char *profile = mlt_properties_get( properties, "profile" ); + int profile_ok = mlt_consumer_profile( properties, profile ); + + // Check that everything is OK + if ( !profile_ok ) + fprintf( stderr, "Unrecognised profile %s - continuing with defaults.\n", mlt_properties_get( properties, "profile" ) ); + else if ( profile_ok < 0 ) + fprintf( stderr, "Recognised profile %s with warnings - trying to continue with some defaults.\n", mlt_properties_get( properties, "profile" ) ); + // Just to make sure nothing is hanging around... mlt_frame_close( this->put ); this->put = NULL; + this->put_active = 1; // Deal with it now. if ( test_card != NULL ) @@ -170,9 +203,9 @@ int mlt_consumer_start( mlt_consumer this ) if ( producer != NULL ) { // Test card should loop I guess... - mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "pause" ); - mlt_producer_set_speed( producer, 0 ); - mlt_producer_set_in_and_out( producer, 0, 0 ); + mlt_properties_set( MLT_PRODUCER_PROPERTIES( producer ), "eof", "loop" ); + //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 ); @@ -215,14 +248,14 @@ int mlt_consumer_put_frame( mlt_consumer this, mlt_frame frame ) struct timeval now; struct timespec tm; pthread_mutex_lock( &this->put_mutex ); - while ( !mlt_consumer_is_stopped( this ) && this->put != NULL ) + while ( this->put_active && 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 ( !mlt_consumer_is_stopped( this ) && this->put == NULL ) + if ( this->put_active && this->put == NULL ) this->put = frame; else mlt_frame_close( frame ); @@ -257,7 +290,7 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) struct timeval now; struct timespec tm; pthread_mutex_lock( &this->put_mutex ); - while ( !mlt_consumer_is_stopped( this ) && this->put == NULL ) + while ( this->put_active && this->put == NULL ) { gettimeofday( &now, NULL ); tm.tv_sec = now.tv_sec + 1; @@ -275,6 +308,10 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) { mlt_service_get_frame( service, &frame, 0 ); } + else + { + frame = mlt_frame_init( ); + } if ( frame != NULL ) { @@ -293,8 +330,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" ) ); - if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) ) - mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 ); + mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ) ); + mlt_properties_set( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) ); } // Return the frame @@ -310,6 +347,168 @@ static inline long time_difference( struct timeval *time1 ) return time1->tv_sec * 1000000 + time1->tv_usec - time2.tv_sec * 1000000 - time2.tv_usec; } +int mlt_consumer_profile( mlt_properties properties, char *profile ) +{ + double fps = mlt_properties_get_double( properties, "fps" ); + int recognised = 1; + double display_num = 0; + double display_den = 0; + double pixel_num = 0; + double pixel_den = 0; + int width = 0; + int height = 0; + + if ( fps == 25.0 && profile != NULL ) + { + width = 720; + height = 576; + display_num = 4; + display_den = 3; + pixel_num = 59; + pixel_den = 54; + + if ( !strcmp( profile, "dv_wide" ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 118; + pixel_den = 81; + } + else if ( !strncmp( profile, "square_wide", 11 ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 1; + pixel_den = 1; + width = 1024; + height = 576; + } + else if ( !strncmp( profile, "square", 6 ) ) + { + pixel_num = 1; + pixel_den = 1; + width = 768; + height = 576; + } + else if ( !strncmp( profile, "vcd", 3 ) ) + { + width = 352; + height = 288; + } + else if ( !strncmp( profile, "cvd", 3 ) ) + { + width = 352; + height = 576; + pixel_num = 59; + pixel_den = 27; + } + else if ( !strncmp( profile, "svcd_wide", 9 ) ) + { + width = 480; + height = 576; + pixel_num = 59; + pixel_den = 27; + display_num = 16; + display_den = 9; + } + else if ( !strncmp( profile, "svcd", 4 ) ) + { + width = 480; + height = 576; + pixel_num = 59; + pixel_den = 36; + } + else if ( strncmp( profile, "frame", 5 ) && strcmp( profile, "dv" ) ) + { + recognised = 0; + } + } + else if ( profile != NULL ) + { + width = 720; + height = 480; + display_num = 4; + display_den = 3; + pixel_num = 10; + pixel_den = 11; + + if ( !strcmp( profile, "dv_wide" ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 40; + pixel_den = 33; + } + else if ( !strncmp( profile, "square_wide", 11 ) ) + { + display_num = 16; + display_den = 9; + pixel_num = 1; + pixel_den = 1; + width = 854; + height = 480; + } + else if ( !strncmp( profile, "square", 6 ) ) + { + pixel_num = 1; + pixel_den = 1; + width = 640; + height = 480; + } + else if ( !strncmp( profile, "vcd", 3 ) ) + { + width = 352; + height = 240; + } + else if ( !strncmp( profile, "cvd", 3 ) ) + { + width = 352; + height = 480; + pixel_num = 20; + pixel_den = 11; + } + else if ( !strncmp( profile, "svcd_wide", 9 ) ) + { + width = 480; + height = 480; + pixel_num = 20; + pixel_den = 11; + display_num = 16; + display_den = 9; + } + else if ( !strncmp( profile, "svcd", 4 ) ) + { + width = 480; + height = 480; + pixel_num = 15; + pixel_den = 11; + } + else if ( strncmp( profile, "frame", 5 ) && strcmp( profile, "dv" ) ) + { + recognised = 0; + } + } + + // If width (or any of the above are 0), we use defaults otherwise we switch to recognised + if ( width != 0 && recognised ) + { + if ( recognised && strchr( profile, ':' ) ) + if ( sscanf( strchr( profile, ':' ) + 1, "%dx%d", &width, &height ) != 2 ) + recognised = -1; + + mlt_properties_set_int( properties, "width", width ); + mlt_properties_set_int( properties, "height", height ); + mlt_properties_set_double( properties, "aspect_ratio", pixel_num / pixel_den ); + mlt_properties_set_int( properties, "aspect_ratio_num", pixel_num ); + mlt_properties_set_int( properties, "aspect_ratio_den", pixel_den ); + mlt_properties_set_double( properties, "display_ratio", display_num / display_den ); + mlt_properties_set_int( properties, "display_ratio_num", display_num ); + mlt_properties_set_int( properties, "display_ratio_den", display_den ); + } + + return recognised; +} + static void *consumer_read_ahead_thread( void *arg ) { // The argument is the consumer @@ -324,6 +523,8 @@ static void *consumer_read_ahead_thread( void *arg ) // See if video is turned off int video_off = mlt_properties_get_int( properties, "video_off" ); + int preview_off = mlt_properties_get_int( properties, "preview_off" ); + int preview_format = mlt_properties_get_int( properties, "preview_format" ); // Get the audio settings mlt_audio_format afmt = mlt_audio_pcm; @@ -354,13 +555,26 @@ static void *consumer_read_ahead_thread( void *arg ) int64_t time_frame = 0; int64_t time_process = 0; int skip_next = 0; + mlt_service lock_object = NULL; + + if ( preview_off && preview_format != 0 ) + this->format = preview_format; // Get the first frame frame = mlt_consumer_get_frame( this ); + // Get the lock object + lock_object = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "consumer_lock_service", NULL ); + + // Lock it + if ( lock_object ) mlt_service_lock( lock_object ); + // Get the image of the first frame if ( !video_off ) + { + mlt_events_fire( MLT_CONSUMER_PROPERTIES( this ), "consumer-frame-render", frame, NULL ); mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 ); + } if ( !audio_off ) { @@ -368,6 +582,10 @@ static void *consumer_read_ahead_thread( void *arg ) mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); } + // Unlock the lock object + if ( lock_object ) mlt_service_unlock( lock_object ); + + // Mark as rendered mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 ); // Get the starting time (can ignore the times above) @@ -376,6 +594,10 @@ static void *consumer_read_ahead_thread( void *arg ) // Continue to read ahead while ( this->ahead ) { + // Fetch width/height again + width = mlt_properties_get_int( properties, "width" ); + height = mlt_properties_get_int( properties, "height" ); + // Put the current frame into the queue pthread_mutex_lock( &this->mutex ); while( this->ahead && mlt_deque_count( this->queue ) >= buffer ) @@ -394,12 +616,19 @@ static void *consumer_read_ahead_thread( void *arg ) if ( frame == NULL ) continue; + // Attempt to fetch the lock object + lock_object = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "consumer_lock_service", NULL ); + // Increment the count count ++; + // Lock if there's a lock object + if ( lock_object ) mlt_service_lock( lock_object ); + // All non normal playback frames should be shown if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "_speed" ) != 1 ) { + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "consumer_deinterlace", 1 ); skipped = 0; time_frame = 0; time_process = 0; @@ -413,7 +642,10 @@ static void *consumer_read_ahead_thread( void *arg ) { // Get the image, mark as rendered and time it if ( !video_off ) + { + mlt_events_fire( MLT_CONSUMER_PROPERTIES( this ), "consumer-frame-render", frame, NULL ); mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 ); + } mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "rendered", 1 ); } else @@ -446,6 +678,9 @@ static void *consumer_read_ahead_thread( void *arg ) // 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; + + // Unlock if there's a lock object + if ( lock_object ) mlt_service_unlock( lock_object ); } // Remove the last frame @@ -456,8 +691,6 @@ 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; @@ -470,12 +703,8 @@ 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, &thread_attributes, consumer_read_ahead_thread, this ); + pthread_create( &this->ahead_thread, NULL, consumer_read_ahead_thread, this ); } static void consumer_read_ahead_stop( mlt_consumer this ) @@ -586,25 +815,25 @@ int mlt_consumer_stop( mlt_consumer this ) { // Get the properies mlt_properties properties = MLT_CONSUMER_PROPERTIES( this ); + char *debug = mlt_properties_get( MLT_CONSUMER_PROPERTIES( this ), "debug" ); + + // Just in case... + if ( debug ) fprintf( stderr, "%s: stopping put waiting\n", debug ); + pthread_mutex_lock( &this->put_mutex ); + this->put_active = 0; + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); // Stop the consumer + if ( debug ) fprintf( stderr, "%s: stopping consumer\n", debug ); if ( this->stop != NULL ) this->stop( this ); // Check if the user has requested real time or not and stop if necessary + if ( debug ) fprintf( stderr, "%s: stopping read_ahead\n", debug ); if ( mlt_properties_get_int( properties, "real_time" ) ) consumer_read_ahead_stop( this ); - // Just in case... - pthread_mutex_lock( &this->put_mutex ); - if ( this->put != NULL ) - { - mlt_frame_close( this->put ); - this->put = NULL; - } - 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 ); @@ -612,6 +841,8 @@ int mlt_consumer_stop( mlt_consumer this ) if ( mlt_properties_get( properties, "post" ) ) system( mlt_properties_get( properties, "post" ) ); + if ( debug ) fprintf( stderr, "%s: stopped\n", debug ); + return 0; } @@ -640,19 +871,17 @@ void mlt_consumer_close( mlt_consumer this ) if ( consumer_close ) { // Just in case... - mlt_consumer_stop( this ); + //mlt_consumer_stop( this ); this->close = NULL; consumer_close( this ); } else { - // Make sure it only gets called once this->parent.close = NULL; // Destroy the push mutex and condition - pthread_cond_broadcast( &this->put_cond ); pthread_mutex_destroy( &this->put_mutex ); pthread_cond_destroy( &this->put_cond );