Remaining audio handling switched to stacks; Minor corrections to compositing and...

[mlt] / src / modules / core / producer_ppm.c

diff --git a/src/modules/core/producer_ppm.c b/src/modules/core/producer_ppm.c
index ba09c3b420590fac56011111d72ede30d5fbd552..480ef4a1275893890098dca34178c743cf69a1d6 100644 (file)
--- a/src/modules/core/producer_ppm.c
+++ b/src/modules/core/producer_ppm.c
@@ -45,10 +45,10 @@ mlt_producer producer_ppm_init( void *command )
        if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 )
        {
                mlt_producer producer = &this->parent;
-               mlt_properties properties = mlt_producer_properties( producer );
+               mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
 
                producer->get_frame = producer_get_frame;
-               producer->close = producer_close;
+               producer->close = ( mlt_destructor )producer_close;
 
                if ( command != NULL )
                {
@@ -69,7 +69,7 @@ mlt_producer producer_ppm_init( void *command )
 static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
        // Get the frames properties
-       mlt_properties properties = mlt_frame_properties( this );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
        if ( mlt_properties_get_int( properties, "has_image" ) )
        {
@@ -83,11 +83,9 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
                // Convert to requested format
                if ( *format == mlt_image_yuv422 )
                {
-                       void *release = NULL;
-                       uint8_t *image = mlt_pool_allocate( *width * ( *height + 1 ) * 2, &release );
+                       uint8_t *image = mlt_pool_alloc( *width * ( *height + 1 ) * 2 );
                        mlt_convert_rgb24_to_yuv422( rgb, *width, *height, *width * 3, image );
-                       mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
-                       mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, NULL, NULL );
+                       mlt_properties_set_data( properties, "image", image, *width * ( *height + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
                        *buffer = image;
                }
                else if ( *format == mlt_image_rgb24 )
@@ -164,7 +162,7 @@ static void producer_ppm_position( producer_ppm this, uint64_t requested )
 static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
        // Get the frames properties
-       mlt_properties properties = mlt_frame_properties( this );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
        FILE *pipe = mlt_properties_get_data( properties, "audio.pipe", NULL );
 
@@ -216,7 +214,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        producer_ppm_position( this, mlt_producer_frame( producer ) );
 
        // Get the frames properties
-       mlt_properties properties = mlt_frame_properties( *frame );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
 
        FILE *video = this->video;
        FILE *audio = this->audio;
@@ -225,20 +223,18 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        if ( video != NULL && read_ppm_header( video, &width, &height ) == 2 )
        {
                // Allocate an image
-               void *release = NULL;
-               uint8_t *image = mlt_pool_allocate( width * ( height + 1 ) * 3, &release );
+               uint8_t *image = mlt_pool_alloc( width * ( height + 1 ) * 3 );
                
                // Read it
                fread( image, width * height * 3, 1, video );
 
                // Pass the data on the frame properties
-               mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
-               mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 3, NULL, NULL );
+               mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 3, ( mlt_destructor )mlt_pool_release, NULL );
                mlt_properties_set_int( properties, "width", width );
                mlt_properties_set_int( properties, "height", height );
                mlt_properties_set_int( properties, "has_image", 1 );
                mlt_properties_set_int( properties, "progressive", 1 );
-               mlt_properties_set_double( properties, "aspect_ratio", ( double )width  / height );
+               mlt_properties_set_double( properties, "aspect_ratio", 1 );
 
                // Push the image callback
                mlt_frame_push_get_image( *frame, producer_get_image );
@@ -253,7 +249,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        mlt_properties_set_data( properties, "audio.pipe", audio, 0, NULL, NULL );
 
        // Hmm - register audio callback
-       ( *frame )->get_audio = producer_get_audio;
+       mlt_frame_push_audio( *frame, producer_get_audio );
 
        // Update timecode on the frame we're creating
        mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
@@ -276,4 +272,3 @@ static void producer_close( mlt_producer parent )
        mlt_producer_close( parent );
        free( this );
 }
-