]> git.sesse.net Git - mlt/blobdiff - src/framework/mlt_consumer.c
Some fixes for alpha masks
[mlt] / src / framework / mlt_consumer.c
index 9bccbed118f4ed3ca7a5c066a7b433bbf3821bb6..4422b111389c7ac95f5120ff5d7c9b9d7005934c 100644 (file)
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
+static void mlt_consumer_frame_show( mlt_listener listener, mlt_properties owner, mlt_service this, void **args );
+
 /** Public final methods
 */
 
@@ -78,12 +80,24 @@ int mlt_consumer_init( mlt_consumer this, void *child )
                // 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;
+
+               mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show );
+               mlt_events_register( properties, "consumer-stopped", 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.
 */
 
@@ -105,7 +119,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.
@@ -113,7 +127,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.
@@ -141,8 +155,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 )
@@ -153,10 +166,6 @@ int mlt_consumer_start( mlt_consumer this )
                                // 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
@@ -165,6 +174,13 @@ 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" );
+
        // Start the service
        if ( this->start != NULL )
                return this->start( this );
@@ -172,7 +188,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 )
@@ -204,8 +220,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( properties, "consumer_deinterlace", 1 );
        }
 
        // Return the frame
@@ -233,8 +249,23 @@ static void *consumer_read_ahead_thread( void *arg )
        int width = mlt_properties_get_int( properties, "width" );
        int height = mlt_properties_get_int( properties, "height" );
 
+       // See if video is turned off
+       int video_off = mlt_properties_get_int( properties, "video_off" );
+
+       // Get the audio settings
+       mlt_audio_format afmt = mlt_audio_pcm;
+       int counter = 0;
+       double fps = mlt_properties_get_double( properties, "fps" );
+       int channels = mlt_properties_get_int( properties, "channels" );
+       int frequency = mlt_properties_get_int( properties, "frequency" );
+       int samples = 0;
+       int16_t *pcm = NULL;
+
+       // See if audio is turned off
+       int audio_off = mlt_properties_get_int( properties, "audio_off" );
+
        // Get the maximum size of the buffer
-       int buffer = mlt_properties_get_int( properties, "buffer" );
+       int buffer = mlt_properties_get_int( properties, "buffer" ) + 1;
 
        // General frame variable
        mlt_frame frame = NULL;
@@ -248,13 +279,23 @@ 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 );
 
        // Get the image of the first frame
-       mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+       if ( !video_off )
+               mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+
+       if ( !audio_off )
+       {
+               samples = mlt_sample_calculator( fps, frequency, counter++ );
+               mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+               frame->get_audio = NULL;
+       }
+
        mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 );
 
        // Get the starting time (can ignore the times above)
@@ -279,32 +320,56 @@ 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_process = 0;
+                       time_wait = 0;
+                       count = 1;
+                       skip_next = 0;
+               }
+
                // Get the image
-               if ( ( time_frame + time_image ) / count < ( 40000 - ( time_wait / count ) ) )
+               if ( !skip_next )
                {
                        // Get the image, mark as rendered and time it
-                       mlt_frame_get_image( frame, &image, &this->format, &width, &height, 0 );
+                       if ( !video_off )
+                               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
                {
                        // 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;
+                               time_process = 0;
                                time_wait = 0;
-                               count = 0;
+                               count = 1;
                        }
                }
+
+               // Always process audio
+               if ( !audio_off )
+               {
+                       samples = mlt_sample_calculator( fps, frequency, counter++ );
+                       mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+                       frame->get_audio = NULL;
+               }
+
+               // Increment the time take for this frame
+               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
@@ -315,6 +380,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;
 
@@ -327,9 +394,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 )
@@ -357,6 +427,21 @@ 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 );
+       }
+}
+
+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 );
        }
 }
 
@@ -369,7 +454,7 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
        mlt_properties properties = mlt_consumer_properties( this );
 
        // Check if the user has requested real time or not
-       if ( mlt_properties_get_int( properties, "real_time" ) )
+       if ( this->real_time )
        {
                int size = 1;
 
@@ -377,9 +462,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 / 2;
+                               size = prefill > 0 && prefill < buffer ? prefill : buffer;
                }
        
                // Get frame from queue
@@ -402,6 +488,15 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this )
        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.
 */
 
@@ -445,15 +540,19 @@ 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 );
+               // Call the childs close if available
+               if ( consumer_close != NULL )
+                       consumer_close( this );
+               else
+                       mlt_service_close( &this->parent );
+       }
 }