X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fdv%2Fconsumer_libdv.c;h=93fabd6c0bd05620ab1019af0034668c903ec24c;hb=363d095af9149cc181e92a35d2e34e583d061747;hp=da86a03faca9bc3d877faca1eecb4d79f3560d43;hpb=021ef038007bbde4d3a54a37c3e614f74c68bdb3;p=melted diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c index da86a03..93fabd6 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 @@ -233,7 +234,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 @@ -246,7 +247,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; @@ -377,7 +378,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 = mlt_pool_alloc( frame_size_625_50 ); + uint8_t *dv_frame = mlt_pool_alloc( FRAME_SIZE_625_50 ); // Frame and size mlt_frame frame = NULL; @@ -418,6 +419,8 @@ static void *consumer_thread( void *arg ) // Tidy up mlt_pool_release( dv_frame ); + mlt_consumer_stopped( this ); + return NULL; }