X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Ffezzik%2Fproducer_hold.c;h=9632932d1be76578616fa21ddfb0ff5c3908a17f;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=d1fdf08bd33f08fc568f304b7f394b97c729e933;hpb=22048fea8f3365274fc4b1a193bb15d1e482895f;p=melted diff --git a/src/modules/fezzik/producer_hold.c b/src/modules/fezzik/producer_hold.c index d1fdf08..9632932 100644 --- a/src/modules/fezzik/producer_hold.c +++ b/src/modules/fezzik/producer_hold.c @@ -3,19 +3,19 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "producer_hold.h" @@ -28,6 +28,7 @@ // Forward references static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index ); +static void producer_close( mlt_producer this ); /** Constructor for the frame holding producer. Basically, all this producer does is provide a producer wrapper for the requested producer, allows the specifcation of @@ -47,7 +48,7 @@ mlt_producer producer_hold_init( char *arg ) if ( this != NULL && producer != NULL ) { // Get the properties of this producer - mlt_properties properties = mlt_producer_properties( this ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( this ); // Store the producer mlt_properties_set_data( properties, "producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); @@ -58,9 +59,11 @@ mlt_producer producer_hold_init( char *arg ) mlt_properties_set_position( properties, "out", 25 ); mlt_properties_set_position( properties, "length", 15000 ); mlt_properties_set( properties, "resource", arg ); + mlt_properties_set( properties, "method", "onefield" ); // Override the get_frame method this->get_frame = producer_get_frame; + this->close = ( mlt_destructor )producer_close; } else { @@ -81,36 +84,36 @@ mlt_producer producer_hold_init( char *arg ) static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable ) { // Get the properties of the frame - mlt_properties properties = mlt_frame_properties( frame ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); // Obtain the real frame mlt_frame real_frame = mlt_frame_pop_service( frame ); // Get the image from the real frame int size = 0; - *buffer = mlt_properties_get_data( mlt_frame_properties( real_frame ), "image", &size ); - *width = mlt_properties_get_int( mlt_frame_properties( real_frame ), "width" ); - *height = mlt_properties_get_int( mlt_frame_properties( real_frame ), "height" ); + *buffer = mlt_properties_get_data( MLT_FRAME_PROPERTIES( real_frame ), "image", &size ); + *width = mlt_properties_get_int( MLT_FRAME_PROPERTIES( real_frame ), "width" ); + *height = mlt_properties_get_int( MLT_FRAME_PROPERTIES( real_frame ), "height" ); // If this is the first time, get it from the producer if ( *buffer == NULL ) { - mlt_properties_pass( mlt_frame_properties( real_frame ), properties, "" ); + mlt_properties_pass( MLT_FRAME_PROPERTIES( real_frame ), properties, "" ); // We'll deinterlace on the downstream deinterlacer - mlt_properties_set_int( mlt_frame_properties( real_frame ), "consumer_deinterlace", 1 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( real_frame ), "consumer_deinterlace", 1 ); // We want distorted to ensure we don't hit the resize filter twice - mlt_properties_set_int( mlt_frame_properties( real_frame ), "distort", 1 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( real_frame ), "distort", 1 ); // Get the image mlt_frame_get_image( real_frame, buffer, format, width, height, writable ); // Make sure we get the size - *buffer = mlt_properties_get_data( mlt_frame_properties( real_frame ), "image", &size ); + *buffer = mlt_properties_get_data( MLT_FRAME_PROPERTIES( real_frame ), "image", &size ); } - mlt_properties_pass( properties, mlt_frame_properties( real_frame ), "" ); + mlt_properties_pass( properties, MLT_FRAME_PROPERTIES( real_frame ), "" ); // Set the values obtained on the frame if ( *buffer != NULL ) @@ -137,7 +140,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index ) { // Get the properties of this producer - mlt_properties properties = mlt_producer_properties( this ); + mlt_properties properties = MLT_PRODUCER_PROPERTIES( this ); // Construct a new frame *frame = mlt_frame_init( ); @@ -161,7 +164,7 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index mlt_producer_seek( producer, position ); // Get the real frame - mlt_service_get_frame( mlt_producer_service( producer ), &real_frame, index ); + mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &real_frame, index ); // Ensure that the real frame gets wiped eventually mlt_properties_set_data( properties, "real_frame", real_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); @@ -169,9 +172,9 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index else { // Temporary fix - ensure that we aren't seen as a test frame - int8_t *image = mlt_properties_get_data( mlt_frame_properties( real_frame ), "image", NULL ); - mlt_properties_set_data( mlt_frame_properties( *frame ), "image", image, 0, NULL, NULL ); - mlt_properties_set_int( mlt_frame_properties( *frame ), "test_image", 0 ); + int8_t *image = mlt_properties_get_data( MLT_FRAME_PROPERTIES( real_frame ), "image", NULL ); + mlt_properties_set_data( MLT_FRAME_PROPERTIES( *frame ), "image", image, 0, NULL, NULL ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( *frame ), "test_image", 0 ); } // Stack the real frame and method @@ -179,7 +182,10 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index mlt_frame_push_service( *frame, producer_get_image ); // Ensure that the consumer sees what the real frame has - mlt_properties_pass( mlt_frame_properties( *frame ), mlt_frame_properties( real_frame ), "" ); + mlt_properties_pass( MLT_FRAME_PROPERTIES( *frame ), MLT_FRAME_PROPERTIES( real_frame ), "" ); + + mlt_properties_set( MLT_FRAME_PROPERTIES( real_frame ), "deinterlace_method", + mlt_properties_get( properties, "method" ) ); } // Move to the next position @@ -187,3 +193,11 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index return 0; } + +static void producer_close( mlt_producer this ) +{ + this->close = NULL; + mlt_producer_close( this ); + free( this ); +} +