X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=b7714920165c43bae5e1064cbc0eb3ed12ab5e40;hb=1d3ab5568258841b1741b8c2fc88ce4e958e6fc6;hp=3d6f6f1fdc242236664651d6625b6147dff06c5e;hpb=48377c7457b33c7e08e648d57187cd4a60f78a3d;p=melted

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index 3d6f6f1..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>
  *
@@ -60,11 +60,9 @@ mlt_consumer consumer_libdv_init( char *arg )
 		// Assign close callback
 		this->close = consumer_close;
 
-		// Interpret the constructor argument
-		if ( arg == NULL || !strcmp( arg, "PAL" ) )
-			mlt_properties_set_double( properties, "fps", 25 );
-		else
-			mlt_properties_set_double( properties, "fps", 29.97 );
+		// Interpret the argument
+		if ( arg != NULL )
+			mlt_properties_set( properties, "target", arg );
 
 		// Set the encode and output handling method
 		mlt_properties_set_data( properties, "video", consumer_encode_video, 0, NULL, NULL );
@@ -132,6 +130,10 @@ static int consumer_stop( mlt_consumer this )
 
 		// Wait for termination
 		pthread_join( *thread, NULL );
+
+		// Close the output file :-) - this is obtuse - doesn't matter if output file
+		// exists or not - the destructor will kick in if it does
+		mlt_properties_set_data( properties, "output_file", NULL, 0, NULL, NULL );
 	}
 
 	return 0;
@@ -176,10 +178,6 @@ static dv_encoder_t *libdv_get_encoder( mlt_consumer this, mlt_frame frame )
 
 		// Store the encoder on the properties
 		mlt_properties_set_data( this_properties, "dv_encoder", encoder, 0, ( mlt_destructor )dv_encoder_free, NULL );
-
-		// Convenience for image dimensions
-		mlt_properties_set_int( this_properties, "width", 720 );
-		mlt_properties_set_int( this_properties, "height", fps == 25 ? 576 : 480 );
 	}
 
 	// Return the encoder
@@ -201,25 +199,23 @@ 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;
-		int is_test = 0;
-
-		if ( mlt_properties_get( this_properties, "rescale" ) != NULL )
-			mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( this_properties, "rescale" ) );
 
 		// Get the image
 		mlt_frame_get_image( frame, &image, &fmt, &width, &height, 0 );
 
-		// determine if this a test card
-		is_test = mlt_frame_is_test_card( frame );
-
 		// Check that we get what we expected
 		if ( fmt != mlt_image_yuv422 || 
 			 width != mlt_properties_get_int( this_properties, "width" ) ||
@@ -236,18 +232,17 @@ static int consumer_encode_video( mlt_consumer this, uint8_t *dv_frame, mlt_fram
 		}
 
 		// Process the frame
-		if ( size != 0 && !( mlt_properties_get_int( this_properties, "was_test_card" ) && is_test ) )
+		if ( size != 0 )
 		{
-			if ( mlt_properties_get_int( mlt_frame_properties( frame ), "top_field_first" ) )
-				image += width * 2;
-
 			// Encode the image
 			dv_encode_full_frame( encoder, &image, e_dv_color_yuv, dv_frame );
-
-			// Note test card status
-			mlt_properties_set_int( this_properties, "was_test_card", is_test );
 		}
 	}
+	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;
 }
@@ -374,23 +369,24 @@ static void *consumer_thread( void *arg )
 	// Allocate a single PAL frame for encoding
 	uint8_t *dv_frame = malloc( frame_size_625_50 );
 
-	// Get the service associated to the consumer
-	mlt_service service = mlt_consumer_service( this );
-
-	// Define a frame pointer
-	mlt_frame frame;
+	// Frame and size
+	mlt_frame frame = NULL;
+	int size = 0;
 
 	// Loop while running
 	while( mlt_properties_get_int( properties, "running" ) )
 	{
 		// Get the frame
-		if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
+		frame = mlt_consumer_rt_frame( this );
+
+		// Check that we have a frame to work with
+		if ( frame != NULL )
 		{
 			// Obtain the dv_encoder
 			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 )