More work with events

[melted] / src / modules / dv / consumer_libdv.c

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 1d4fafa..6dce526 100644 (file)
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -1,5 +1,5 @@
 /*
- * producer_libdv.c -- a DV encoder based on libdv
+ * consumer_libdv.c -- a DV encoder based on libdv
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
@@ -20,6 +20,7 @@
 
 // Local header files
 #include "consumer_libdv.h"
+#include "producer_libdv.h"
 
 // mlt Header files
 #include <framework/mlt_frame.h>
@@ -98,6 +99,7 @@ static int consumer_start( mlt_consumer this )
        {
                // Allocate a thread
                pthread_t *thread = calloc( 1, sizeof( pthread_t ) );
+               pthread_attr_t thread_attributes;
 
                // Assign the thread to properties
                mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL );
@@ -105,8 +107,12 @@ static int consumer_start( mlt_consumer this )
                // Set the running state
                mlt_properties_set_int( properties, "running", 1 );
 
+               // Inherit the scheduling priority
+               pthread_attr_init( &thread_attributes );
+               pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+               
                // Create the thread
-               pthread_create( thread, NULL, consumer_thread, this );
+               pthread_create( thread, &thread_attributes, consumer_thread, this );
        }
        return 0;
 }
@@ -199,16 +205,22 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
        // This will hold the size of the dv frame
        int size = 0;
 
+       // Is the image rendered
+       int rendered = mlt_properties_get_int( mlt_frame_properties( frame ), "rendered" );
+
+       // Get width and height
+       int width = mlt_properties_get_int( this_properties, "width" );
+       int height = mlt_properties_get_int( this_properties, "height" );
+
        // If we get an encoder, then encode the image
-       if ( encoder != NULL )
+       if ( rendered && encoder != NULL )
        {
                // Specify desired image properties
                mlt_image_format fmt = mlt_image_yuv422;
-               int width = mlt_properties_get_int( this_properties, "width" );
-               int height = mlt_properties_get_int( this_properties, "height" );
                uint8_t *image = NULL;
 
                // Get the image
+               mlt_events_fire( this_properties, "consumer-frame-show", frame, NULL );
                mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
 
                // Check that we get what we expected
@@ -223,7 +235,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
                else
                {
                        // Calculate the size of the dv frame
-                       size = height == 576 ? frame_size_625_50 : frame_size_525_60;
+                       size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
                }
 
                // Process the frame
@@ -233,6 +245,11 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
                        dv_encode_full_frame( encoder, &image, e_dv_color_yuv, dv_frame );
                }
        }
+       else if ( encoder != NULL )
+       {
+               // Calculate the size of the dv frame (duplicate of previous)
+               size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
+       }
        
        return size;
 }
@@ -260,7 +277,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
                // Default audio args
                mlt_audio_format fmt = mlt_audio_pcm;
                int channels = 2;
-               int frequency = 48000;
+               int frequency = mlt_properties_get_int( this_properties, "frequency" );
                int samples = mlt_sample_calculator( mlt_properties_get_double( this_properties, "fps" ), frequency, count );
                int16_t *pcm = NULL;
 
@@ -275,7 +292,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
                int i = 0;
                int j = 0;
                for ( i = 0 ; i < 4; i ++ )
-                       audio_buffers[ i ] = calloc( 1, 2 * DV_AUDIO_MAX_SAMPLES );
+                       audio_buffers[ i ] = mlt_pool_alloc( 2 * DV_AUDIO_MAX_SAMPLES );
 
                // Get the audio
                mlt_frame_get_audio( frame, &pcm, &fmt, &frequency, &channels, &samples );
@@ -290,6 +307,11 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
                                for ( j = 0; j < channels; j++ )
                                        audio_buffers[ j ][ i ] = *pcm ++;
                }
+               else
+               {
+                       for ( j = 0; j < channels; j++ )
+                               memset( audio_buffers[ j ], 0, 2 * DV_AUDIO_MAX_SAMPLES );
+               }
 
                // Encode audio on frame
                dv_encode_full_audio( encoder, audio_buffers, channels, frequency, dv_frame );
@@ -303,7 +325,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
 
                // Temporary - free audio buffers
                for ( i = 0 ; i < 4; i ++ )
-                       free( audio_buffers[ i ] );
+                       mlt_pool_release( audio_buffers[ i ] );
        }
 }
 
@@ -357,13 +379,17 @@ static void *consumer_thread( void *arg )
        int ( *output )( mlt_consumer, uint8_t *, int, mlt_frame ) = mlt_properties_get_data( properties, "output", NULL );
 
        // Allocate a single PAL frame for encoding
-       uint8_t *dv_frame = malloc( frame_size_625_50 );
+       uint8_t *dv_frame = mlt_pool_alloc( FRAME_SIZE_625_50 );
+
+       // Frame and size
+       mlt_frame frame = NULL;
+       int size = 0;
 
        // Loop while running
        while( mlt_properties_get_int( properties, "running" ) )
        {
                // Get the frame
-               mlt_frame frame = mlt_consumer_rt_frame( this, mlt_image_yuv422 );
+               frame = mlt_consumer_rt_frame( this );
 
                // Check that we have a frame to work with
                if ( frame != NULL )
@@ -372,7 +398,7 @@ static void *consumer_thread( void *arg )
                        if ( libdv_get_encoder( this, frame ) != NULL )
                        {
                                // Encode the image
-                               int size = video( this, dv_frame, frame );
+                               size = video( this, dv_frame, frame );
 
                                // Encode the audio
                                if ( size > 0 )
@@ -392,7 +418,9 @@ static void *consumer_thread( void *arg )
        }
 
        // Tidy up
-       free( dv_frame );
+       mlt_pool_release( dv_frame );
+
+       mlt_consumer_stopped( this );
 
        return NULL;
 }
@@ -411,4 +439,3 @@ static void consumer_close( mlt_consumer this )
        // Free the memory
        free( this );
 }
-