aspect fixes for rescale=none

[melted] / src / framework / mlt_consumer.c

diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
index a04863d..9bccbed 100644 (file)
--- a/src/framework/mlt_consumer.c
+++ b/src/framework/mlt_consumer.c
@@ -53,6 +53,7 @@ int mlt_consumer_init( mlt_consumer this, void *child )
                        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", 128.0 / 117.0 );
                }
                else
                {
@@ -61,23 +62,44 @@ int mlt_consumer_init( mlt_consumer this, void *child )
                        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", 72.0 / 79.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 );
 
+               // 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 );
+
                // 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.
 */
 
@@ -223,6 +245,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;
@@ -263,6 +286,24 @@ static void *consumer_read_ahead_thread( void *arg )
                        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 ++;
+
+                       // If we've reached an unacceptable level, reset everything
+                       if ( skipped > 10 )
+                       {
+                               skipped = 0;
+                               time_frame = 0;
+                               time_image = 0;
+                               time_wait = 0;
+                               count = 0;
+                       }
                }
        }
 
@@ -323,24 +364,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 ( mlt_properties_get_int( properties, "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 / 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 );
        }
+       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;
 }
@@ -357,8 +414,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 );
@@ -399,4 +457,3 @@ void mlt_consumer_close( mlt_consumer this )
        else
                mlt_service_close( &this->parent );
 }
-