X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=af25795956394dc9ccb14b4eb5d62e5c9b92a0ff;hb=c287a51b7a4c2cc437256c178a5eb2e7775d34fa;hp=15fa136ad1d9b74a02791607273c80748272add8;hpb=00db7ed91dfa61f9e144b6d5548350a5954deb61;p=mlt

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 15fa136a..af257959 100644
--- 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>
  *
@@ -199,13 +199,18 @@ 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
@@ -233,6 +238,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;
 }
@@ -275,7 +285,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 );
@@ -303,7 +313,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 +367,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_get_frame( this );
+		frame = mlt_consumer_rt_frame( this );
 
 		// Check that we have a frame to work with
 		if ( frame != NULL )
@@ -372,7 +386,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 +406,7 @@ static void *consumer_thread( void *arg )
 	}
 
 	// Tidy up
-	free( dv_frame );
+	mlt_pool_release( dv_frame );
 
 	return NULL;
 }