X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=6dce526bef2c36950d030879136bdfefa17d15dc;hb=a420b41a9a0771635b340649961f9fb69d3774fe;hp=b7714920165c43bae5e1064cbc0eb3ed12ab5e40;hpb=01453096ad1094889d18c81f7012908465db18c9;p=melted

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index b771492..6dce526 100644
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -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;
 }
@@ -214,6 +220,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
 		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
@@ -228,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
@@ -241,7 +248,7 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
 	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;
+		size = height == 576 ? FRAME_SIZE_625_50 : FRAME_SIZE_525_60;
 	}
 	
 	return size;
@@ -270,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;
 
@@ -285,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 );
@@ -300,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 );
@@ -313,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 ] );
 	}
 }
 
@@ -367,7 +379,7 @@ 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;
@@ -406,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;
 }
@@ -425,4 +439,3 @@ static void consumer_close( mlt_consumer this )
 	// Free the memory
 	free( this );
 }
-