]> git.sesse.net Git - mlt/blobdiff - src/framework/mlt_frame.c
make mlt_position type double
[mlt] / src / framework / mlt_frame.c
index 6424a5477eaa56eecd4f1c9eb998f88fd4580fce..7c8b5f83145a30a26cf429b223d955f9ea3c5905 100644 (file)
@@ -1,7 +1,10 @@
-/*
- * mlt_frame.c -- interface for all frame classes
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
- * Author: Charles Yates <charles.yates@pandora.be>
+/**
+ * \file mlt_frame.c
+ * \brief interface for all frame classes
+ * \see mlt_frame_s
+ *
+ * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
 #include "mlt_producer.h"
 #include "mlt_factory.h"
 #include "mlt_profile.h"
+#include "mlt_log.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
 
-/** Constructor for a frame.
-*/
+/** Construct a frame object.
+ *
+ * \public \memberof mlt_frame_s
+ * \param service the pointer to any service that can provide access to the profile
+ * \return a frame object on success or NULL if there was an allocation error
+ */
 
 mlt_frame mlt_frame_init( mlt_service service )
 {
        // Allocate a frame
-       mlt_frame this = calloc( sizeof( struct mlt_frame_s ), 1 );
+       mlt_frame self = calloc( 1, sizeof( struct mlt_frame_s ) );
 
-       if ( this != NULL )
+       if ( self != NULL )
        {
                mlt_profile profile = mlt_service_profile( service );
 
                // Initialise the properties
-               mlt_properties properties = &this->parent;
-               mlt_properties_init( properties, this );
+               mlt_properties properties = &self->parent;
+               mlt_properties_init( properties, self );
 
                // Set default properties on the frame
                mlt_properties_set_position( properties, "_position", 0.0 );
                mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
                mlt_properties_set_int( properties, "width", profile? profile->width : 720 );
                mlt_properties_set_int( properties, "height", profile? profile->height : 576 );
-               mlt_properties_set_int( properties, "normalised_width", profile? profile->width : 720 );
-               mlt_properties_set_int( properties, "normalised_height", profile? profile->height : 576 );
                mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) );
                mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL );
                mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL );
 
                // Construct stacks for frames and methods
-               this->stack_image = mlt_deque_init( );
-               this->stack_audio = mlt_deque_init( );
-               this->stack_service = mlt_deque_init( );
+               self->stack_image = mlt_deque_init( );
+               self->stack_audio = mlt_deque_init( );
+               self->stack_service = mlt_deque_init( );
        }
 
-       return this;
+       return self;
 }
 
-/** Fetch the frames properties.
-*/
+/** Get a frame's properties.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the frame's properties or NULL if an invalid frame is supplied
+ */
 
-mlt_properties mlt_frame_properties( mlt_frame this )
+mlt_properties mlt_frame_properties( mlt_frame self )
 {
-       return this != NULL ? &this->parent : NULL;
+       return self != NULL ? &self->parent : NULL;
 }
 
-/** Check if we have a way to derive something other than a test card.
-*/
+/** Determine if the frame will produce a test card image.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return true (non-zero) if this will produce from a test card
+ */
 
-int mlt_frame_is_test_card( mlt_frame this )
+int mlt_frame_is_test_card( mlt_frame self )
 {
-       return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_image" );
+       return mlt_deque_count( self->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( self ), "test_image" );
 }
 
-/** Check if we have a way to derive something other than test audio.
-*/
+/** Determine if the frame will produce audio from a test card.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return true (non-zero) if this will produce from a test card
+ */
 
-int mlt_frame_is_test_audio( mlt_frame this )
+int mlt_frame_is_test_audio( mlt_frame self )
 {
-       return mlt_deque_count( this->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" );
+       return mlt_deque_count( self->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( self ), "test_audio" );
 }
 
-/** Get the aspect ratio of the frame.
-*/
+/** Get the sample aspect ratio of the frame.
+ *
+ * \public \memberof  mlt_frame_s
+ * \param self a frame
+ * \return the aspect ratio
+ */
 
-double mlt_frame_get_aspect_ratio( mlt_frame this )
+double mlt_frame_get_aspect_ratio( mlt_frame self )
 {
-       return mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio" );
+       return mlt_properties_get_double( MLT_FRAME_PROPERTIES( self ), "aspect_ratio" );
 }
 
-/** Set the aspect ratio of the frame.
-*/
+/** Set the sample aspect ratio of the frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param value the new image sample aspect ratio
+ * \return true if error
+ */
 
-int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
+int mlt_frame_set_aspect_ratio( mlt_frame self, double value )
 {
-       return mlt_properties_set_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio", value );
+       return mlt_properties_set_double( MLT_FRAME_PROPERTIES( self ), "aspect_ratio", value );
 }
 
-/** Get the position of this frame.
-*/
+/** Get the time position of this frame.
+ *
+ * This position is not necessarily the position as the original
+ * producer knows it. It could be the position that the playlist,
+ * multitrack, or tractor producer set.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the position
+ * \see mlt_frame_original_position
+ */
+
+mlt_position mlt_frame_get_position( mlt_frame self )
+{
+       int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( self ), "_position" );
+       return pos < 0 ? 0 : pos;
+}
+
+/** Get the original time position of this frame.
+ *
+ * This is the position that the original producer set on the frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the position
+ */
 
-mlt_position mlt_frame_get_position( mlt_frame this )
+mlt_position mlt_frame_original_position( mlt_frame self )
 {
-       int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), "_position" );
+       int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( self ), "original_position" );
        return pos < 0 ? 0 : pos;
 }
 
-/** Set the position of this frame.
-*/
+/** Set the time position of this frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param value the position
+ * \return true if error
+ */
 
-int mlt_frame_set_position( mlt_frame this, mlt_position value )
+int mlt_frame_set_position( mlt_frame self, mlt_position value )
 {
-       return mlt_properties_set_position( MLT_FRAME_PROPERTIES( this ), "_position", value );
+       // Only set the original_position the first time.
+       if ( ! mlt_properties_get( MLT_FRAME_PROPERTIES( self ), "original_position" ) )
+               mlt_properties_set_position( MLT_FRAME_PROPERTIES( self ), "original_position", value );
+       return mlt_properties_set_position( MLT_FRAME_PROPERTIES( self ), "_position", value );
 }
 
 /** Stack a get_image callback.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param the get_image callback
+ * \return true if error
+ */
 
-int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
+int mlt_frame_push_get_image( mlt_frame self, mlt_get_image get_image )
 {
-       return mlt_deque_push_back( this->stack_image, get_image );
+       return mlt_deque_push_back( self->stack_image, get_image );
 }
 
 /** Pop a get_image callback.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the get_image callback
+ */
 
-mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
+mlt_get_image mlt_frame_pop_get_image( mlt_frame self )
 {
-       return mlt_deque_pop_back( this->stack_image );
+       return mlt_deque_pop_back( self->stack_image );
 }
 
 /** Push a frame.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param that the frame to push onto \p self
+ * \return true if error
+ */
 
-int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
+int mlt_frame_push_frame( mlt_frame self, mlt_frame that )
 {
-       return mlt_deque_push_back( this->stack_image, that );
+       return mlt_deque_push_back( self->stack_image, that );
 }
 
 /** Pop a frame.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return a frame that was previously pushed
+ */
 
-mlt_frame mlt_frame_pop_frame( mlt_frame this )
+mlt_frame mlt_frame_pop_frame( mlt_frame self )
 {
-       return mlt_deque_pop_back( this->stack_image );
+       return mlt_deque_pop_back( self->stack_image );
 }
 
 /** Push a service.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param that an opaque pointer
+ * \return true if error
+ */
 
-int mlt_frame_push_service( mlt_frame this, void *that )
+int mlt_frame_push_service( mlt_frame self, void *that )
 {
-       return mlt_deque_push_back( this->stack_image, that );
+       return mlt_deque_push_back( self->stack_image, that );
 }
 
 /** Pop a service.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return an opaque pointer to something previously pushed
+ */
 
-void *mlt_frame_pop_service( mlt_frame this )
+void *mlt_frame_pop_service( mlt_frame self )
 {
-       return mlt_deque_pop_back( this->stack_image );
+       return mlt_deque_pop_back( self->stack_image );
 }
 
-/** Push a service.
-*/
+/** Push a number.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param that an integer
+ * \return true if error
+ */
 
-int mlt_frame_push_service_int( mlt_frame this, int that )
+int mlt_frame_push_service_int( mlt_frame self, int that )
 {
-       return mlt_deque_push_back_int( this->stack_image, that );
+       return mlt_deque_push_back_int( self->stack_image, that );
 }
 
-/** Pop a service.
-*/
+/** Pop a number.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return an integer that was previously pushed
+ */
 
-int mlt_frame_pop_service_int( mlt_frame this )
+int mlt_frame_pop_service_int( mlt_frame self )
 {
-       return mlt_deque_pop_back_int( this->stack_image );
+       return mlt_deque_pop_back_int( self->stack_image );
 }
 
 /** Push an audio item on the stack.
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param that an opaque pointer
+ * \return true if error
+ */
 
-int mlt_frame_push_audio( mlt_frame this, void *that )
+int mlt_frame_push_audio( mlt_frame self, void *that )
 {
-       return mlt_deque_push_back( this->stack_audio, that );
+       return mlt_deque_push_back( self->stack_audio, that );
 }
 
 /** Pop an audio item from the stack
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return an opaque pointer to something that was pushed onto the frame's audio stack
+ */
 
-void *mlt_frame_pop_audio( mlt_frame this )
+void *mlt_frame_pop_audio( mlt_frame self )
 {
-       return mlt_deque_pop_back( this->stack_audio );
+       return mlt_deque_pop_back( self->stack_audio );
 }
 
 /** Return the service stack
-*/
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the service stack
+ */
 
-mlt_deque mlt_frame_service_stack( mlt_frame this )
+mlt_deque mlt_frame_service_stack( mlt_frame self )
 {
-       return this->stack_service;
+       return self->stack_service;
 }
 
-/** Replace image stack with the information provided.
-
-       This might prove to be unreliable and restrictive - the idea is that a transition
-       which normally uses two images may decide to only use the b frame (ie: in the case
-       of a composite where the b frame completely obscures the a frame).
-
-       The image must be writable and the destructor for the image itself must be taken
-       care of on another frame and that frame cannot have a replace applied to it... 
-       Further it assumes that no alpha mask is in use.
+/** Set a new image on the frame.
+  *
+  * \public \memberof mlt_frame_s
+  * \param self a frame
+  * \param image a pointer to the raw image data
+  * \param size the size of the image data in bytes (optional)
+  * \param destroy a function to deallocate \p image when the frame is closed (optional)
+  * \return true if error
+  */
+
+int mlt_frame_set_image( mlt_frame self, uint8_t *image, int size, mlt_destructor destroy )
+{
+       return mlt_properties_set_data( MLT_FRAME_PROPERTIES( self ), "image", image, size, destroy, NULL );
+}
 
-       For these reasons, it can only be used in a specific situation - when you have 
-       multiple tracks each with their own transition and these transitions are applied
-       in a strictly reversed order (ie: highest numbered [lowest track] is processed 
-       first).
+/** Set a new alpha channel on the frame.
+  *
+  * \public \memberof mlt_frame_s
+  * \param self a frame
+  * \param alpha a pointer to the alpha channel
+  * \param size the size of the alpha channel in bytes (optional)
+  * \param destroy a function to deallocate \p alpha when the frame is closed (optional)
+  * \return true if error
+  */
+
+int mlt_frame_set_alpha( mlt_frame self, uint8_t *alpha, int size, mlt_destructor destroy )
+{
+       self->get_alpha_mask = NULL;
+       return mlt_properties_set_data( MLT_FRAME_PROPERTIES( self ), "alpha", alpha, size, destroy, NULL );
+}
 
-       More reliable approach - the cases should be detected during the process phase
-       and the upper tracks should simply not be invited to stack...
-*/
+/** Replace image stack with the information provided.
+ *
+ * This might prove to be unreliable and restrictive - the idea is that a transition
+ * which normally uses two images may decide to only use the b frame (ie: in the case
+ * of a composite where the b frame completely obscures the a frame).
+ *
+ * The image must be writable and the destructor for the image itself must be taken
+ * care of on another frame and that frame cannot have a replace applied to it...
+ * Further it assumes that no alpha mask is in use.
+ *
+ * For these reasons, it can only be used in a specific situation - when you have
+ * multiple tracks each with their own transition and these transitions are applied
+ * in a strictly reversed order (ie: highest numbered [lowest track] is processed
+ * first).
+ *
+ * More reliable approach - the cases should be detected during the process phase
+ * and the upper tracks should simply not be invited to stack...
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param image a new image
+ * \param format the image format
+ * \param width the width of the new image
+ * \param height the height of the new image
+ */
 
-void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format format, int width, int height )
+void mlt_frame_replace_image( mlt_frame self, uint8_t *image, mlt_image_format format, int width, int height )
 {
        // Remove all items from the stack
-       while( mlt_deque_pop_back( this->stack_image ) ) ;
-
-       // Update the information 
-       mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", image, 0, NULL, NULL );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "width", width );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "height", height );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "format", format );
-       this->get_alpha_mask = NULL;
+       while( mlt_deque_pop_back( self->stack_image ) ) ;
+
+       // Update the information
+       mlt_properties_set_data( MLT_FRAME_PROPERTIES( self ), "image", image, 0, NULL, NULL );
+       mlt_properties_set_int( MLT_FRAME_PROPERTIES( self ), "width", width );
+       mlt_properties_set_int( MLT_FRAME_PROPERTIES( self ), "height", height );
+       mlt_properties_set_int( MLT_FRAME_PROPERTIES( self ), "format", format );
+       self->get_alpha_mask = NULL;
 }
 
-/** Get the image associated to the frame.
-*/
+/** Get the short name for an image format.
+ *
+ * \public \memberof mlt_frame_s
+ * \param format the image format
+ * \return a string
+ */
 
-int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
+const char * mlt_image_format_name( mlt_image_format format )
 {
-       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
-       mlt_get_image get_image = mlt_frame_pop_get_image( this );
-       mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
-       int error = 0;
-
-       if ( get_image != NULL )
+       switch ( format )
        {
-               mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
-               mlt_position position = mlt_frame_get_position( this );
-               error = get_image( this, buffer, format, width, height, writable );
-               mlt_properties_set_int( properties, "width", *width );
-               mlt_properties_set_int( properties, "height", *height );
-               mlt_properties_set_int( properties, "format", *format );
-               mlt_frame_set_position( this, position );
+               case mlt_image_none:    return "none";
+               case mlt_image_rgb24:   return "rgb24";
+               case mlt_image_rgb24a:  return "rgb24a";
+               case mlt_image_yuv422:  return "yuv422";
+               case mlt_image_yuv420p: return "yuv420p";
+               case mlt_image_opengl:  return "opengl";
+               case mlt_image_glsl:    return "glsl";
+               case mlt_image_glsl_texture: return "glsl_texture";
        }
-       else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
+       return "invalid";
+}
+
+/** Get the number of bytes needed for an image.
+  *
+  * \public \memberof mlt_frame_s
+  * \param format the image format
+  * \param width width of the image in pixels
+  * \param height height of the image in pixels
+  * \param[out] bpp the number of bytes per pixel (optional)
+  * \return the number of bytes
+  */
+int mlt_image_format_size( mlt_image_format format, int width, int height, int *bpp )
+{
+       height += 1;
+       switch ( format )
        {
-               *format = mlt_properties_get_int( properties, "format" );
-               *buffer = mlt_properties_get_data( properties, "image", NULL );
-               *width = mlt_properties_get_int( properties, "width" );
-               *height = mlt_properties_get_int( properties, "height" );
+               case mlt_image_rgb24:
+                       if ( bpp ) *bpp = 3;
+                       return width * height * 3;
+               case mlt_image_opengl:
+               case mlt_image_rgb24a:
+                       if ( bpp ) *bpp = 4;
+                       return width * height * 4;
+               case mlt_image_yuv422:
+                       if ( bpp ) *bpp = 2;
+                       return width * height * 2;
+               case mlt_image_yuv420p:
+                       if ( bpp ) *bpp = 3 / 2;
+                       return width * height * 3 / 2;
+               default:
+                       if ( bpp ) *bpp = 0;
+                       return 0;
        }
-       else if ( producer != NULL )
+       return 0;
+}
+
+static int generate_test_image( mlt_properties properties, uint8_t **buffer,  mlt_image_format *format, int *width, int *height, int writable )
+{
+       mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
+       mlt_image_format requested_format = *format;
+       int error = 1;
+
+       if ( producer )
        {
                mlt_frame test_frame = NULL;
                mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 );
-               if ( test_frame != NULL )
+               if ( test_frame )
                {
                        mlt_properties test_properties = MLT_FRAME_PROPERTIES( test_frame );
-                       mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
-                       mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
-                       mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
                        mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL );
-                       mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL );
-                       mlt_properties_set_int( properties, "width", *width );
-                       mlt_properties_set_int( properties, "height", *height );
-                       mlt_properties_set_int( properties, "format", *format );
-                       mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
+                       mlt_properties_set( test_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
+                       error = mlt_frame_get_image( test_frame, buffer, format, width, height, writable );
+                       if ( !error && buffer && *buffer )
+                       {
+                               mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
+                               mlt_properties_set_int( properties, "width", *width );
+                               mlt_properties_set_int( properties, "height", *height );
+                               if ( test_frame->convert_image && requested_format != mlt_image_none )
+                                       test_frame->convert_image( test_frame, buffer, format, requested_format );
+                               mlt_properties_set_int( properties, "format", *format );
+                       }
                }
                else
                {
                        mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
-                       mlt_frame_get_image( this, buffer, format, width, height, writable );
                }
        }
-       else
+       if ( error && buffer && *format != mlt_image_none )
        {
-               register uint8_t *p;
-               register uint8_t *q;
                int size = 0;
 
                *width = *width == 0 ? 720 : *width;
@@ -304,14 +485,10 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                mlt_properties_set_int( properties, "format", *format );
                mlt_properties_set_int( properties, "width", *width );
                mlt_properties_set_int( properties, "height", *height );
-               mlt_properties_set_int( properties, "aspect_ratio", 0 );
+               mlt_properties_set_double( properties, "aspect_ratio", 1.0 );
 
                switch( *format )
                {
-                       case mlt_image_none:
-                               size = 0;
-                               *buffer = NULL;
-                               break;
                        case mlt_image_rgb24:
                                size *= 3;
                                size += *width * 3;
@@ -331,70 +508,222 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                                size *= 2;
                                size += *width * 2;
                                *buffer = mlt_pool_alloc( size );
-                               p = *buffer;
-                               q = p + size;
-                               while ( p != NULL && p != q )
+                               if ( *buffer )
                                {
-                                       *p ++ = 235;
-                                       *p ++ = 128;
+                                       register uint8_t *p = *buffer;
+                                       register uint8_t *q = p + size;
+                                       while ( p != NULL && p != q )
+                                       {
+                                               *p ++ = 235;
+                                               *p ++ = 128;
+                                       }
                                }
                                break;
                        case mlt_image_yuv420p:
-                               size = size * 3 / 2;
-                               *buffer = mlt_pool_alloc( size );
+                               *buffer = mlt_pool_alloc( size * 3 / 2 );
                                if ( *buffer )
-                                       memset( *buffer, 255, size );
+                               {
+                                       memset( *buffer, 235, size );
+                                       memset( *buffer + size, 128, size / 2 );
+                               }
+                               break;
+                       default:
+                               size = 0;
                                break;
                }
-
                mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
                mlt_properties_set_int( properties, "test_image", 1 );
+               error = 0;
        }
+       return error;
+}
+
 
-       mlt_properties_set_int( properties, "scaled_width", *width );
-       mlt_properties_set_int( properties, "scaled_height", *height );
+/** Get the image associated to the frame.
+ *
+ * You should express the desired format, width, and height as inputs. As long
+ * as the loader producer was used to generate this or the imageconvert filter
+ * was attached, then you will get the image back in the format you desire.
+ * However, you do not always get the width and height you request depending
+ * on properties and filters. You do not need to supply a pre-allocated
+ * buffer, but you should always supply the desired image format.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param[out] buffer an image buffer
+ * \param[in,out] format the image format
+ * \param[in,out] width the horizontal size in pixels
+ * \param[in,out] height the vertical size in pixels
+ * \param writable whether or not you will need to be able to write to the memory returned in \p buffer
+ * \return true if error
+ * \todo Better describe the width and height as inputs.
+ */
+
+int mlt_frame_get_image( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
+{
+       mlt_properties properties = MLT_FRAME_PROPERTIES( self );
+       mlt_get_image get_image = mlt_frame_pop_get_image( self );
+       mlt_image_format requested_format = *format;
+       int error = 0;
+
+       if ( get_image )
+       {
+               mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
+               error = get_image( self, buffer, format, width, height, writable );
+               if ( !error && buffer && *buffer )
+               {
+                       mlt_properties_set_int( properties, "width", *width );
+                       mlt_properties_set_int( properties, "height", *height );
+                       if ( self->convert_image && requested_format != mlt_image_none )
+                               self->convert_image( self, buffer, format, requested_format );
+                       mlt_properties_set_int( properties, "format", *format );
+               }
+               else
+               {
+                       error = generate_test_image( properties, buffer, format, width, height, writable );
+               }
+       }
+       else if ( mlt_properties_get_data( properties, "image", NULL ) && buffer )
+       {
+               *format = mlt_properties_get_int( properties, "format" );
+               *buffer = mlt_properties_get_data( properties, "image", NULL );
+               *width = mlt_properties_get_int( properties, "width" );
+               *height = mlt_properties_get_int( properties, "height" );
+               if ( self->convert_image && *buffer && requested_format != mlt_image_none )
+               {
+                       self->convert_image( self, buffer, format, requested_format );
+                       mlt_properties_set_int( properties, "format", *format );
+               }
+       }
+       else
+       {
+               error = generate_test_image( properties, buffer, format, width, height, writable );
+       }
 
        return error;
 }
 
-uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
+/** Get the alpha channel associated to the frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return the alpha channel
+ */
+
+uint8_t *mlt_frame_get_alpha_mask( mlt_frame self )
 {
        uint8_t *alpha = NULL;
-       if ( this != NULL )
+       if ( self != NULL )
        {
-               if ( this->get_alpha_mask != NULL )
-                       alpha = this->get_alpha_mask( this );
+               if ( self->get_alpha_mask != NULL )
+                       alpha = self->get_alpha_mask( self );
                if ( alpha == NULL )
-                       alpha = mlt_properties_get_data( &this->parent, "alpha", NULL );
+                       alpha = mlt_properties_get_data( &self->parent, "alpha", NULL );
                if ( alpha == NULL )
                {
-                       int size = mlt_properties_get_int( &this->parent, "scaled_width" ) * mlt_properties_get_int( &this->parent, "scaled_height" );
+                       int size = mlt_properties_get_int( &self->parent, "width" ) * mlt_properties_get_int( &self->parent, "height" );
                        alpha = mlt_pool_alloc( size );
                        memset( alpha, 255, size );
-                       mlt_properties_set_data( &this->parent, "alpha", alpha, size, mlt_pool_release, NULL );
+                       mlt_properties_set_data( &self->parent, "alpha", alpha, size, mlt_pool_release, NULL );
                }
        }
        return alpha;
 }
 
-int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+/** Get the short name for an audio format.
+ *
+ * You do not need to deallocate the returned string.
+ * \public \memberof mlt_frame_s
+ * \param format an audio format enum
+ * \return a string for the name of the image format
+ */
+
+const char * mlt_audio_format_name( mlt_audio_format format )
 {
-       mlt_get_audio get_audio = mlt_frame_pop_audio( this );
-       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+       switch ( format )
+       {
+               case mlt_audio_none:   return "none";
+               case mlt_audio_s16:    return "s16";
+               case mlt_audio_s32:    return "s32";
+               case mlt_audio_s32le:  return "s32le";
+               case mlt_audio_float:  return "float";
+               case mlt_audio_f32le:  return "f32le";
+               case mlt_audio_u8:     return "u8";
+       }
+       return "invalid";
+}
+
+/** Get the amount of bytes needed for a block of audio.
+  *
+  * \public \memberof mlt_frame_s
+  * \param format an audio format enum
+  * \param samples the number of samples per channel
+  * \param channels the number of channels
+  * \return the number of bytes
+  */
+
+int mlt_audio_format_size( mlt_audio_format format, int samples, int channels )
+{
+       switch ( format )
+       {
+               case mlt_audio_none:   return 0;
+               case mlt_audio_s16:    return samples * channels * sizeof( int16_t );
+               case mlt_audio_s32le:
+               case mlt_audio_s32:    return samples * channels * sizeof( int32_t );
+               case mlt_audio_f32le:
+               case mlt_audio_float:  return samples * channels * sizeof( float );
+               case mlt_audio_u8:     return samples * channels;
+       }
+       return 0;
+}
+
+/** Get the audio associated to the frame.
+ *
+ * You should express the desired format, frequency, channels, and samples as inputs. As long
+ * as the loader producer was used to generate this or the audioconvert filter
+ * was attached, then you will get the audio back in the format you desire.
+ * However, you do not always get the channels and samples you request depending
+ * on properties and filters. You do not need to supply a pre-allocated
+ * buffer, but you should always supply the desired audio format.
+ * The audio is always in interleaved format.
+ * You should use the \p mlt_sample_calculator to determine the number of samples you want.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param[out] buffer an audio buffer
+ * \param[in,out] format the audio format
+ * \param[in,out] frequency the sample rate
+ * \param[in,out] channels
+ * \param[in,out] samples the number of samples per frame
+ * \return true if error
+ */
+
+int mlt_frame_get_audio( mlt_frame self, void **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+{
+       mlt_get_audio get_audio = mlt_frame_pop_audio( self );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( self );
        int hide = mlt_properties_get_int( properties, "test_audio" );
+       mlt_audio_format requested_format = *format;
 
        if ( hide == 0 && get_audio != NULL )
        {
-               mlt_position position = mlt_frame_get_position( this );
-               get_audio( this, buffer, format, frequency, channels, samples );
-               mlt_frame_set_position( this, position );
+               get_audio( self, buffer, format, frequency, channels, samples );
+               mlt_properties_set_int( properties, "audio_frequency", *frequency );
+               mlt_properties_set_int( properties, "audio_channels", *channels );
+               mlt_properties_set_int( properties, "audio_samples", *samples );
+               mlt_properties_set_int( properties, "audio_format", *format );
+               if ( self->convert_audio && *buffer && requested_format != mlt_audio_none )
+                       self->convert_audio( self, buffer, format, requested_format );
        }
        else if ( mlt_properties_get_data( properties, "audio", NULL ) )
        {
                *buffer = mlt_properties_get_data( properties, "audio", NULL );
+               *format = mlt_properties_get_int( properties, "audio_format" );
                *frequency = mlt_properties_get_int( properties, "audio_frequency" );
                *channels = mlt_properties_get_int( properties, "audio_channels" );
                *samples = mlt_properties_get_int( properties, "audio_samples" );
+               if ( self->convert_audio && *buffer && requested_format != mlt_audio_none )
+                       self->convert_audio( self, buffer, format, requested_format );
        }
        else
        {
@@ -402,19 +731,39 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
                *samples = *samples <= 0 ? 1920 : *samples;
                *channels = *channels <= 0 ? 2 : *channels;
                *frequency = *frequency <= 0 ? 48000 : *frequency;
-               size = *samples * *channels * sizeof( int16_t );
-               *buffer = mlt_pool_alloc( size );
-               if ( *buffer != NULL )
+               mlt_properties_set_int( properties, "audio_frequency", *frequency );
+               mlt_properties_set_int( properties, "audio_channels", *channels );
+               mlt_properties_set_int( properties, "audio_samples", *samples );
+               mlt_properties_set_int( properties, "audio_format", *format );
+
+               switch( *format )
+               {
+                       case mlt_image_none:
+                               size = 0;
+                               *buffer = NULL;
+                               break;
+                       case mlt_audio_s16:
+                               size = *samples * *channels * sizeof( int16_t );
+                               break;
+                       case mlt_audio_s32:
+                               size = *samples * *channels * sizeof( int32_t );
+                               break;
+                       case mlt_audio_float:
+                               size = *samples * *channels * sizeof( float );
+                               break;
+                       default:
+                               break;
+               }
+               if ( size )
+                       *buffer = mlt_pool_alloc( size );
+               if ( *buffer )
                        memset( *buffer, 0, size );
                mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
                mlt_properties_set_int( properties, "test_audio", 1 );
        }
 
-       mlt_properties_set_int( properties, "audio_frequency", *frequency );
-       mlt_properties_set_int( properties, "audio_channels", *channels );
-       mlt_properties_set_int( properties, "audio_samples", *samples );
-
-       if ( mlt_properties_get( properties, "meta.volume" ) )
+       // TODO: This does not belong here
+       if ( *format == mlt_audio_s16 && mlt_properties_get( properties, "meta.volume" ) )
        {
                double value = mlt_properties_get_double( properties, "meta.volume" );
 
@@ -439,873 +788,322 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
        return 0;
 }
 
-unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h )
+/** Set the audio on a frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param buffer an buffer containing audio samples
+ * \param format the format of the audio in the \p buffer
+ * \param size the total size of the buffer (optional)
+ * \param destructor a function that releases or deallocates the \p buffer
+ * \return true if error
+ */
+
+int mlt_frame_set_audio( mlt_frame self, void *buffer, mlt_audio_format format, int size, mlt_destructor destructor )
+{
+       mlt_properties_set_int( MLT_FRAME_PROPERTIES( self ), "audio_format", format );
+       return mlt_properties_set_data( MLT_FRAME_PROPERTIES( self ), "audio", buffer, size, destructor, NULL );
+}
+
+/** Get audio on a frame as a waveform image.
+ *
+ * This generates an 8-bit grayscale image representation of the audio in a
+ * frame. Currently, this only really works for 2 channels.
+ * This allocates the bitmap using mlt_pool so you should release the return
+ * value with \p mlt_pool_release.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param w the width of the image
+ * \param h the height of the image to create
+ * \return a pointer to a new bitmap
+ */
+
+unsigned char *mlt_frame_get_waveform( mlt_frame self, int w, int h )
 {
        int16_t *pcm = NULL;
-       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
-       mlt_audio_format format = mlt_audio_pcm;
-       int frequency = 32000; // lower frequency available?
+       mlt_properties properties = MLT_FRAME_PROPERTIES( self );
+       mlt_audio_format format = mlt_audio_s16;
+       int frequency = 16000;
        int channels = 2;
-       double fps = mlt_profile_fps( NULL );
-       int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
-       
+       mlt_producer producer = mlt_frame_get_original_producer( self );
+       double fps = mlt_producer_get_fps( mlt_producer_cut_parent( producer ) );
+       int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( self ) );
+
+       // Increase audio resolution proportional to requested image size
+       while ( samples < w )
+       {
+               frequency += 16000;
+               samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( self ) );
+       }
+
        // Get the pcm data
-       mlt_frame_get_audio( this, &pcm, &format, &frequency, &channels, &samples );
-       
+       mlt_frame_get_audio( self, (void**)&pcm, &format, &frequency, &channels, &samples );
+
        // Make an 8-bit buffer large enough to hold rendering
        int size = w * h;
+       if ( size <= 0 )
+               return NULL;
        unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size );
        if ( bitmap != NULL )
                memset( bitmap, 0, size );
+       else
+               return NULL;
        mlt_properties_set_data( properties, "waveform", bitmap, size, ( mlt_destructor )mlt_pool_release, NULL );
-       
+
        // Render vertical lines
        int16_t *ubound = pcm + samples * channels;
-       int skip = samples / w - 1;
+       int skip = samples / w;
+       skip = !skip ? 1 : skip;
+       unsigned char gray = 0xFF / skip;
        int i, j, k;
-       
+
        // Iterate sample stream and along x coordinate
-       for ( i = 0; i < w && pcm < ubound; i++ )
+       for ( i = 0; pcm < ubound; i++ )
        {
                // pcm data has channels interleaved
-               for ( j = 0; j < channels; j++ )
+               for ( j = 0; j < channels; j++, pcm++ )
                {
                        // Determine sample's magnitude from 2s complement;
                        int pcm_magnitude = *pcm < 0 ? ~(*pcm) + 1 : *pcm;
-                       // The height of a line is the ratio of the magnitude multiplied by 
-                       // half the vertical resolution
-                       int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 );
-                       // Determine the starting y coordinate - left channel above center,
-                       // right channel below - currently assumes 2 channels
-                       int displacement = ( h / 2 ) - ( 1 - j ) * height;
+                       // The height of a line is the ratio of the magnitude multiplied by
+                       // the vertical resolution of a single channel
+                               int height = h * pcm_magnitude / channels / 2 / 32768;
+                       // Determine the starting y coordinate - left top, right bottom
+                       int displacement = h * (j * 2 + 1) / channels / 2 - ( *pcm < 0 ? 0 : height );
                        // Position buffer pointer using y coordinate, stride, and x coordinate
-                       unsigned char *p = &bitmap[ i + displacement * w ];
-                       
+                       unsigned char *p = bitmap + i / skip + displacement * w;
+
                        // Draw vertical line
-                       for ( k = 0; k < height; k++ )
-                               p[ w * k ] = 0xFF;
-                       
-                       pcm++;
+                       for ( k = 0; k < height + 1; k++ )
+                               if ( *pcm < 0 )
+                                       p[ w * k ] = ( k == 0 ) ? 0xFF : p[ w * k ] + gray;
+                               else
+                                       p[ w * k ] = ( k == height ) ? 0xFF : p[ w * k ] + gray;
                }
-               pcm += skip * channels;
        }
 
        return bitmap;
 }
 
-mlt_producer mlt_frame_get_original_producer( mlt_frame this )
-{
-       if ( this != NULL )
-               return mlt_properties_get_data( MLT_FRAME_PROPERTIES( this ), "_producer", NULL );
-       return NULL;
-}
-
-void mlt_frame_close( mlt_frame this )
-{
-       if ( this != NULL && mlt_properties_dec_ref( MLT_FRAME_PROPERTIES( this ) ) <= 0 )
-       {
-               mlt_deque_close( this->stack_image );
-               mlt_deque_close( this->stack_audio );
-               while( mlt_deque_peek_back( this->stack_service ) )
-                       mlt_service_close( mlt_deque_pop_back( this->stack_service ) );
-               mlt_deque_close( this->stack_service );
-               mlt_properties_close( &this->parent );
-               free( this );
-       }
-}
-
-/***** convenience functions *****/
+/** Get the end service that produced self frame.
+ *
+ * This fetches the first producer of the frame and not any producers that
+ * encapsulate it.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \return a producer
+ */
 
-int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total )
+mlt_producer mlt_frame_get_original_producer( mlt_frame self )
 {
-       int ret = 0;
-       int yy, uu, vv;
-       int r,g,b;
-       total /= 2;
-       while (total--) 
-       {
-               yy = yuv[0];
-               uu = yuv[1];
-               vv = yuv[3];
-               YUV2RGB(yy, uu, vv, r, g, b);
-               rgba[0] = r;
-               rgba[1] = g;
-               rgba[2] = b;
-               rgba[3] = 255;
-               yy = yuv[2];
-               YUV2RGB(yy, uu, vv, r, g, b);
-               rgba[4] = r;
-               rgba[5] = g;
-               rgba[6] = b;
-               rgba[7] = 255;
-               yuv += 4;
-               rgba += 8;
-       }
-       return ret;
+       if ( self != NULL )
+               return mlt_properties_get_data( MLT_FRAME_PROPERTIES( self ), "_producer", NULL );
+       return NULL;
 }
 
-int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
-{
-       int ret = 0;
-       register int y0, y1, u0, u1, v0, v1;
-       register int r, g, b;
-       register uint8_t *d = yuv;
-       register int i, j;
-
-       if ( alpha )
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       else
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-
-       return ret;
-}
+/** Destroy the frame.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ */
 
-int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv )
+void mlt_frame_close( mlt_frame self )
 {
-       int ret = 0;
-       register int y0, y1, u0, u1, v0, v1;
-       register int r, g, b;
-       register uint8_t *d = yuv;
-       register int i, j;
-
-       for ( i = 0; i < height; i++ )
+       if ( self != NULL && mlt_properties_dec_ref( MLT_FRAME_PROPERTIES( self ) ) <= 0 )
        {
-               register uint8_t *s = rgb + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
+               mlt_deque_close( self->stack_image );
+               mlt_deque_close( self->stack_audio );
+               while( mlt_deque_peek_back( self->stack_service ) )
+                       mlt_service_close( mlt_deque_pop_back( self->stack_service ) );
+               mlt_deque_close( self->stack_service );
+               mlt_properties_close( &self->parent );
+               free( self );
        }
-       return ret;
 }
 
-int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
-{
-       int ret = 0;
-       register int y0, y1, u0, u1, v0, v1;
-       register int r, g, b;
-       register uint8_t *d = yuv;
-       register int i, j;
-
-       if ( alpha )
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       *alpha++ = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       else
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       return ret;
-}
-
-int mlt_convert_bgr24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv )
-{
-       int ret = 0;
-       register int y0, y1, u0, u1, v0, v1;
-       register int r, g, b;
-       register uint8_t *d = yuv;
-       register int i, j;
-
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgb + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       b = *s++;
-                       g = *s++;
-                       r = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       return ret;
-}
+/***** convenience functions *****/
 
-int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
-{
-       int ret = 0;
-       register int y0, y1, u0, u1, v0, v1;
-       register int r, g, b;
-       register uint8_t *d = yuv;
-       register int i, j;
-
-       if ( alpha )
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       *alpha++ = *s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *alpha++ = *s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       *alpha++ = *s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       else
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *s = rgba + ( stride * i );
-               for ( j = 0; j < ( width / 2 ); j++ )
-               {
-                       s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y1, u1 , v1);
-                       *d++ = y0;
-                       *d++ = (u0+u1) >> 1;
-                       *d++ = y1;
-                       *d++ = (v0+v1) >> 1;
-               }
-               if ( width % 2 )
-               {
-                       s++;
-                       r = *s++;
-                       g = *s++;
-                       b = *s++;
-                       RGB2YUV (r, g, b, y0, u0 , v0);
-                       *d++ = y0;
-                       *d++ = u0;
-               }
-       }
-       return ret;
-}
+/** Determine the number of samples that belong in a frame at a time position.
+ *
+ * \public \memberof mlt_frame_s
+ * \param fps the frame rate
+ * \param frequency the sample rate
+ * \param position the time position
+ * \return the number of samples per channel
+ */
 
-int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv )
+int mlt_sample_calculator( float fps, int frequency, int64_t position )
 {
-       int ret = 0;
-       register int i, j;
-
-       int half = width >> 1;
-
-       uint8_t *Y = yuv420p;
-       uint8_t *U = Y + width * height;
-       uint8_t *V = U + width * height / 4;
-
-       register uint8_t *d = yuv;
-
-       for ( i = 0; i < height; i++ )
-       {
-               register uint8_t *u = U + ( i / 2 ) * ( half );
-               register uint8_t *v = V + ( i / 2 ) * ( half );
-
-               for ( j = 0; j < half; j++ )
-               {
-                       *d ++ = *Y ++;
-                       *d ++ = *u ++;
-                       *d ++ = *Y ++;
-                       *d ++ = *v ++;
-               }
-       }
-       return ret;
+       /* Compute the cumulative number of samples until the start of this frame and the
+       cumulative number of samples until the start of the next frame. Round each to the
+       nearest integer and take the difference to determine the number of samples in
+       this frame.
+
+       This approach should prevent rounding errors that can accumulate over a large number
+       of frames causing A/V sync problems. */
+       return mlt_sample_calculator_to_now( fps, frequency, position + 1 )
+                - mlt_sample_calculator_to_now( fps, frequency, position );
 }
 
-uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value )
-{
-       uint8_t *output = NULL;
-
-       if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) )
-       {
-               uint8_t *out_line;
-               int offset_x = ( owidth - iwidth ) / 2;
-               int offset_y = ( oheight - iheight ) / 2;
-               int iused = iwidth;
-
-               output = mlt_pool_alloc( owidth * oheight );
-               memset( output, alpha_value, owidth * oheight );
-
-               offset_x -= offset_x % 2;
-
-               out_line = output + offset_y * owidth;
-               out_line += offset_x;
-
-               // Loop for the entirety of our output height.
-               while ( iheight -- )
-               {
-                       // We're in the input range for this row.
-                       memcpy( out_line, input, iused );
-
-                       // Move to next input line
-                       input += iwidth;
-
-                       // Move to next output line
-                       out_line += owidth;
-               }
-       }
-
-       return output;
-}
+/** Determine the number of samples that belong before a time position.
+ *
+ * \public \memberof mlt_frame_s
+ * \param fps the frame rate
+ * \param frequency the sample rate
+ * \param position the time position
+ * \return the number of samples per channel
+ * \bug Will this break when mlt_position is converted to double?
+ */
 
-void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight )
+int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t position )
 {
-       // Calculate strides
-       int istride = iwidth * 2;
-       int ostride = owidth * 2;
-       int offset_x = ( owidth - iwidth );
-       int offset_y = ( oheight - iheight ) / 2;
-       uint8_t *in_line = input;
-       uint8_t *out_line;
-       int size = owidth * oheight;
-       uint8_t *p = output;
-
-       // Optimisation point
-       if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) )
-       {
-               return;
-       }
-       else if ( iwidth == owidth && iheight == oheight )
-       {
-               memcpy( output, input, iheight * istride );
-               return;
-       }
+       int64_t samples = 0;
 
-       while( size -- )
+       if ( fps )
        {
-               *p ++ = 16;
-               *p ++ = 128;
+               samples = (int64_t)( (double) position * (double) frequency / (double) fps +
+                       ( position < 0 ? -0.5 : 0.5 ) );
        }
 
-       offset_x -= offset_x % 4;
-
-       out_line = output + offset_y * ostride;
-       out_line += offset_x;
-
-       // Loop for the entirety of our output height.
-       while ( iheight -- )
-       {
-               // We're in the input range for this row.
-               memcpy( out_line, in_line, iwidth * 2 );
-
-               // Move to next input line
-               in_line += istride;
-
-               // Move to next output line
-               out_line += ostride;
-       }
+       return samples;
 }
 
-/** A resizing function for yuv422 frames - this does not rescale, but simply
-       resizes. It assumes yuv422 images available on the frame so use with care.
-*/
-
-uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
+void mlt_frame_write_ppm( mlt_frame frame )
 {
-       // Get properties
-       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
-
-       // Get the input image, width and height
-       uint8_t *input = mlt_properties_get_data( properties, "image", NULL );
-       uint8_t *alpha = mlt_frame_get_alpha_mask( this );
-
-       int iwidth = mlt_properties_get_int( properties, "width" );
-       int iheight = mlt_properties_get_int( properties, "height" );
-
-       // If width and height are correct, don't do anything
-       if ( iwidth != owidth || iheight != oheight )
+       int width = 0;
+       int height = 0;
+       mlt_image_format format = mlt_image_rgb24;
+       uint8_t *image;
+       
+       if ( mlt_frame_get_image( frame, &image, &format, &width, &height, 0 ) == 0 )
        {
-               uint8_t alpha_value = mlt_properties_get_int( properties, "resize_alpha" );
-
-               // Create the output image
-               uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
-
-               // Call the generic resize
-               mlt_resize_yuv422( output, owidth, oheight, input, iwidth, iheight );
-
-               // Now update the frame
-               mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
-               mlt_properties_set_int( properties, "width", owidth );
-               mlt_properties_set_int( properties, "height", oheight );
-
-               // We should resize the alpha too
-               alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight, alpha_value );
-               if ( alpha != NULL )
-               {
-                       mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
-                       this->get_alpha_mask = NULL;
-               }
-
-               // Return the output
-               return output;
+               FILE *file;
+               char filename[16];
+               
+               sprintf( filename, "frame-%05d.ppm", (int)mlt_frame_get_position( frame ) );
+               file = fopen( filename, "wb" );
+               if ( !file )
+                       return;
+               fprintf( file, "P6\n%d %d\n255\n", width, height);
+               fwrite( image, width * height * 3, 1, file );
+               fclose( file );
        }
-       // No change, return input
-       return input;
 }
 
-/** A rescaling function for yuv422 frames - low quality, and provided for testing
-       only. It assumes yuv422 images available on the frame so use with care.
-*/
+/** Get or create a properties object unique to this service instance.
+ *
+ * Use this function to hold a service's processing parameters for this
+ * particular frame. Set the parameters in the service's process function.
+ * Then, get the parameters in the function it pushes to the frame's audio
+ * or image stack. This makes the service more parallel by reducing race
+ * conditions and less sensitive to multiple instances (by not setting a
+ * non-unique property on the frame). Creation and destruction of the
+ * properties object is handled automatically.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self a frame
+ * \param service a service
+ * \return a properties object
+ */
 
-uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
+mlt_properties mlt_frame_unique_properties( mlt_frame self, mlt_service service )
 {
-       // Get properties
-       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
-
-       // Get the input image, width and height
-       uint8_t *input = mlt_properties_get_data( properties, "image", NULL );
-       int iwidth = mlt_properties_get_int( properties, "width" );
-       int iheight = mlt_properties_get_int( properties, "height" );
-
-       // If width and height are correct, don't do anything
-       if ( iwidth != owidth || iheight != oheight )
-       {
-               // Create the output image
-               uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
-
-               // Calculate strides
-               int istride = iwidth * 2;
-               int ostride = owidth * 2;
-
-               iwidth = iwidth - ( iwidth % 4 );
-
-               // Derived coordinates
-               int dy, dx;
-
-       // Calculate ranges
-       int out_x_range = owidth / 2;
-       int out_y_range = oheight / 2;
-       int in_x_range = iwidth / 2;
-       int in_y_range = iheight / 2;
-
-       // Output pointers
-       register uint8_t *out_line = output;
-       register uint8_t *out_ptr;
-
-       // Calculate a middle pointer
-       uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2;
-       uint8_t *in_line;
-
-               // Generate the affine transform scaling values
-               register int scale_width = ( iwidth << 16 ) / owidth;
-               register int scale_height = ( iheight << 16 ) / oheight;
-               register int base = 0;
-
-               int outer = out_x_range * scale_width;
-               int bottom = out_y_range * scale_height;
-
-       // Loop for the entirety of our output height.
-       for ( dy = - bottom; dy < bottom; dy += scale_height )
-       {
-               // Start at the beginning of the line
-               out_ptr = out_line;
+       mlt_properties frame_props = MLT_FRAME_PROPERTIES( self );
+       mlt_properties service_props = MLT_SERVICE_PROPERTIES( service );
+       char *unique = mlt_properties_get( service_props, "_unique_id" );
+       mlt_properties instance_props = mlt_properties_get_data( frame_props, unique, NULL );
        
-               // Pointer to the middle of the input line
-               in_line = in_middle + ( dy >> 16 ) * istride;
-
-               // Loop for the entirety of our output row.
-               for ( dx = - outer; dx < outer; dx += scale_width )
-               {
-                               base = dx >> 15;
-                               base &= 0xfffffffe;
-                               *out_ptr ++ = *( in_line + base );
-                               base &= 0xfffffffc;
-                               *out_ptr ++ = *( in_line + base + 1 );
-                               dx += scale_width;
-                               base = dx >> 15;
-                               base &= 0xfffffffe;
-                               *out_ptr ++ = *( in_line + base );
-                               base &= 0xfffffffc;
-                               *out_ptr ++ = *( in_line + base + 3 );
-               }
-
-               // Move to next output line
-               out_line += ostride;
-       }
-
-               // Now update the frame
-               mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
-               mlt_properties_set_int( properties, "width", owidth );
-               mlt_properties_set_int( properties, "height", oheight );
-
-               // Return the output
-               return output;
-       }
-
-       // No change, return input
-       return input;
-}
-
-int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
-{
-       int ret = 0;
-       int16_t *src, *dest;
-       int frequency_src = *frequency, frequency_dest = *frequency;
-       int channels_src = *channels, channels_dest = *channels;
-       int samples_src = *samples, samples_dest = *samples;
-       int i, j;
-       double d = 0, s = 0;
-
-       mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
-       mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
-
-       int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
-       if ( silent )
-               memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) );
-
-       silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 );
-       if ( silent )
-               memset( src, 0, samples_src * channels_src * sizeof( int16_t ) );
-
-       if ( channels_src > 6 )
-               channels_src = 0;
-       if ( channels_dest > 6 )
-               channels_dest = 0;
-       if ( samples_src > 4000 )
-               samples_src = 0;
-       if ( samples_dest > 4000 )
-               samples_dest = 0;
-
-       // determine number of samples to process
-       *samples = samples_src < samples_dest ? samples_src : samples_dest;
-       *channels = channels_src < channels_dest ? channels_src : channels_dest;
-       *buffer = dest;
-       *frequency = frequency_dest;
-
-       // Compute a smooth ramp over start to end
-       float weight = weight_start;
-       float weight_step = ( weight_end - weight_start ) / *samples;
-
-       if ( src == dest )
+       if ( !instance_props )
        {
-               *samples = samples_src;
-               *channels = channels_src;
-               *buffer = src;
-               *frequency = frequency_src;
-               return ret;
+               instance_props = mlt_properties_new();
+               mlt_properties_set_data( frame_props, unique, instance_props, 0, (mlt_destructor) mlt_properties_close, NULL );
        }
 
-       // Mixdown
-       for ( i = 0; i < *samples; i++ )
-       {
-               for ( j = 0; j < *channels; j++ )
-               {
-                       if ( j < channels_dest )
-                               d = (double) dest[ i * channels_dest + j ];
-                       if ( j < channels_src )
-                               s = (double) src[ i * channels_src + j ];
-                       dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
-               }
-               weight += weight_step;
-       }
-
-       return ret;
+       return instance_props;
 }
 
-// Replacement for broken mlt_frame_audio_mix - this filter uses an inline low pass filter
-// to allow mixing without volume hacking
-int mlt_frame_combine_audio( mlt_frame this, mlt_frame that, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
+/** Make a copy of a frame.
+ *
+ * This does not copy the get_image/get_audio processing stacks or any
+ * data properties other than the audio and image.
+ *
+ * \public \memberof mlt_frame_s
+ * \param self the frame to clone
+ * \param is_deep a boolean to indicate whether to make a deep copy of the audio
+ * and video data chunks or to make a shallow copy by pointing to the supplied frame
+ * \return a almost-complete copy of the frame
+ * \todo copy the processing deques
+ */
+
+mlt_frame mlt_frame_clone( mlt_frame self, int is_deep )
 {
-       int ret = 0;
-       int16_t *src, *dest;
-       int frequency_src = *frequency, frequency_dest = *frequency;
-       int channels_src = *channels, channels_dest = *channels;
-       int samples_src = *samples, samples_dest = *samples;
-       int i, j;
-       double vp[ 6 ];
-       double b_weight = 1.0;
-
-       if ( mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "meta.mixdown" ) )
-               b_weight = 1.0 - mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "meta.volume" );
-
-       mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
-       mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
-
-       int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
-       if ( silent )
-               memset( dest, 0, samples_dest * channels_dest * sizeof( int16_t ) );
-
-       silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( that ), "silent_audio" );
-       mlt_properties_set_int( MLT_FRAME_PROPERTIES( that ), "silent_audio", 0 );
-       if ( silent )
-               memset( src, 0, samples_src * channels_src * sizeof( int16_t ) );
-
-       if ( src == dest )
-       {
-               *samples = samples_src;
-               *channels = channels_src;
-               *buffer = src;
-               *frequency = frequency_src;
-               return ret;
-       }
+       mlt_frame new_frame = mlt_frame_init( NULL );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( self );
+       mlt_properties new_props = MLT_FRAME_PROPERTIES( new_frame );
+       void *data, *copy;
+       int size;
 
-       // determine number of samples to process
-       *samples = samples_src < samples_dest ? samples_src : samples_dest;
-       *channels = channels_src < channels_dest ? channels_src : channels_dest;
-       *buffer = dest;
-       *frequency = frequency_dest;
+       mlt_properties_inherit( new_props, properties );
 
-       for ( j = 0; j < *channels; j++ )
-               vp[ j ] = ( double )dest[ j ];
+       // Carry over some special data properties for the multi consumer.
+       mlt_properties_set_data( new_props, "_producer",
+               mlt_frame_get_original_producer( self ), 0, NULL, NULL );
+       mlt_properties_set_data( new_props, "movit.convert",
+               mlt_properties_get_data( properties, "movit.convert", NULL), 0, NULL, NULL );
 
-       double Fc = 0.5;
-       double B = exp(-2.0 * M_PI * Fc);
-       double A = 1.0 - B;
-       double v;
-       
-       for ( i = 0; i < *samples; i++ )
+       if ( is_deep )
        {
-               for ( j = 0; j < *channels; j++ )
+               data = mlt_properties_get_data( properties, "audio", &size );
+               if ( data )
                {
-                       v = ( double )( b_weight * dest[ i * channels_dest + j ] + src[ i * channels_src + j ] );
-                       v = v < -32767 ? -32767 : v > 32768 ? 32768 : v;
-                       vp[ j ] = dest[ i * channels_dest + j ] = ( int16_t )( v * A + vp[ j ] * B );
+                       if ( !size )
+                               size = mlt_audio_format_size( mlt_properties_get_int( properties, "audio_format" ),
+                                       mlt_properties_get_int( properties, "audio_samples" ),
+                                       mlt_properties_get_int( properties, "audio_channels" ) );
+                       copy = mlt_pool_alloc( size );
+                       memcpy( copy, data, size );
+                       mlt_properties_set_data( new_props, "audio", copy, size, mlt_pool_release, NULL );
                }
-       }
-
-       return ret;
-}
-
-/* Will this break when mlt_position is converted to double? -Zach */
-int mlt_sample_calculator( float fps, int frequency, int64_t position )
-{
-       int samples = 0;
-
-       if ( ( int )( fps * 100 ) == 2997 )
-       {
-               samples = frequency / 30;
-
-               switch ( frequency )
+               data = mlt_properties_get_data( properties, "image", &size );
+               if ( data )
                {
-                       case 48000:
-                               if ( position % 5 != 0 )
-                                       samples += 2;
-                               break;
-                       case 44100:
-                               if ( position % 300 == 0 )
-                                       samples = 1471;
-                               else if ( position % 30 == 0 )
-                                       samples = 1470;
-                               else if ( position % 2 == 0 )
-                                       samples = 1472;
-                               else
-                                       samples = 1471;
-                               break;
-                       case 32000:
-                               if ( position % 30 == 0 )
-                                       samples = 1068;
-                               else if ( position % 29 == 0 )
-                                       samples = 1067;
-                               else if ( position % 4 == 2 )
-                                       samples = 1067;
-                               else
-                                       samples = 1068;
-                               break;
-                       default:
-                               samples = 0;
-               }
-       }
-       else if ( fps != 0 )
-       {
-               samples = frequency / fps;
-       }
-
-       return samples;
-}
-
-int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame )
-{
-       int64_t samples = 0;
-
-       // TODO: Correct rules for NTSC and drop the * 100 hack
-       if ( ( int )( fps * 100 ) == 2997 )
-       {
-               samples = ( ( double )( frame * frequency ) / 30 );
-               switch( frequency )
-               {
-                       case 48000:
-                               samples += 2 * ( frame / 5 );
-                               break;
-                       case 44100:
-                               samples += frame + ( frame / 2 ) - ( frame / 30 ) + ( frame / 300 );
-                               break;
-                       case 32000:
-                               samples += ( 2 * frame ) - ( frame / 4 ) - ( frame / 29 );
-                               break;
+                       if ( ! size )
+                               size = mlt_image_format_size( mlt_properties_get_int( properties, "format" ),
+                                       mlt_properties_get_int( properties, "width" ),
+                                       mlt_properties_get_int( properties, "height" ), NULL );
+                       copy = mlt_pool_alloc( size );
+                       memcpy( copy, data, size );
+                       mlt_properties_set_data( new_props, "image", copy, size, mlt_pool_release, NULL );
+
+                       data = mlt_properties_get_data( properties, "alpha", &size );
+                       if ( data )
+                       {
+                               if ( ! size )
+                                       size = mlt_properties_get_int( properties, "width" ) *
+                                               mlt_properties_get_int( properties, "height" );
+                               copy = mlt_pool_alloc( size );
+                               memcpy( copy, data, size );
+                               mlt_properties_set_data( new_props, "alpha", copy, size, mlt_pool_release, NULL );
+                       };
                }
        }
-       else if ( fps != 0 )
+       else
        {
-               samples = ( ( frame * frequency ) / ( int )fps );
+               // This frame takes a reference on the original frame since the data is a shallow copy.
+               mlt_properties_inc_ref( properties );
+               mlt_properties_set_data( new_props, "_cloned_frame", self, 0,
+                       (mlt_destructor) mlt_frame_close, NULL );
+
+               // Copy properties
+               data = mlt_properties_get_data( properties, "audio", &size );
+               mlt_properties_set_data( new_props, "audio", data, size, NULL, NULL );
+               data = mlt_properties_get_data( properties, "image", &size );
+               mlt_properties_set_data( new_props, "image", data, size, NULL, NULL );
+               data = mlt_properties_get_data( properties, "alpha", &size );
+               mlt_properties_set_data( new_props, "alpha", data, size, NULL, NULL );
        }
 
-       return samples;
+       return new_frame;
 }