X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=b7714920165c43bae5e1064cbc0eb3ed12ab5e40;hb=ac0225a1c4b16cab62e6044b18818f44933a29e9;hp=1d4fafa107c789fce82f79cda2b5d7e6fb2faa1f;hpb=5c299d1ae6f3535df35b3f30bae0476a1ca50aa6;p=melted

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 1d4fafa..b771492 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;
 }
@@ -359,11 +369,15 @@ static void *consumer_thread( void *arg )
 	// Allocate a single PAL frame for encoding
 	uint8_t *dv_frame = malloc( 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 +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 )