]> git.sesse.net Git - mlt/blobdiff - src/framework/mlt_frame.c
Add doxygen documentation for mlt_profile, mlt_pool, mlt_repository, and mlt_factory.
[mlt] / src / framework / mlt_frame.c
index 04bc9baab41882bf8303490f1be9797f8dc0939c..0899b06505cb292cc64da90b935129695504c3af 100644 (file)
@@ -1,42 +1,47 @@
-/*
- * 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
  *
- * 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.
+ * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
+ * \author Charles Yates <charles.yates@pandora.be>
  *
- * This program is distributed in the hope that it will be useful,
+ * 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 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 "config.h"
 #include "mlt_frame.h"
 #include "mlt_producer.h"
+#include "mlt_factory.h"
+#include "mlt_profile.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 /** Constructor for a frame.
 */
 
-mlt_frame mlt_frame_init( )
+mlt_frame mlt_frame_init( mlt_service service )
 {
        // Allocate a frame
        mlt_frame this = calloc( sizeof( struct mlt_frame_s ), 1 );
 
        if ( this != NULL )
        {
-               // Get the normalisation
-               char *normalisation = getenv( "MLT_NORMALISATION" );
+               mlt_profile profile = mlt_service_profile( service );
 
                // Initialise the properties
                mlt_properties properties = &this->parent;
@@ -45,29 +50,18 @@ mlt_frame mlt_frame_init( )
                // Set default properties on the frame
                mlt_properties_set_position( properties, "_position", 0.0 );
                mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
-
-               if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) )
-               {
-                       mlt_properties_set_int( properties, "width", 720 );
-                       mlt_properties_set_int( properties, "height", 576 );
-                       mlt_properties_set_int( properties, "normalised_width", 720 );
-                       mlt_properties_set_int( properties, "normalised_height", 576 );
-               }
-               else
-               {
-                       mlt_properties_set_int( properties, "width", 720 );
-                       mlt_properties_set_int( properties, "height", 480 );
-                       mlt_properties_set_int( properties, "normalised_width", 720 );
-                       mlt_properties_set_int( properties, "normalised_height", 480 );
-               }
-
-               mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+               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_get_image = mlt_deque_init( );
-               this->stack_frame = mlt_deque_init( );
+               this->stack_image = mlt_deque_init( );
+               this->stack_audio = mlt_deque_init( );
+               this->stack_service = mlt_deque_init( );
        }
 
        return this;
@@ -78,7 +72,7 @@ mlt_frame mlt_frame_init( )
 
 mlt_properties mlt_frame_properties( mlt_frame this )
 {
-       return &this->parent;
+       return this != NULL ? &this->parent : NULL;
 }
 
 /** Check if we have a way to derive something other than a test card.
@@ -86,15 +80,15 @@ mlt_properties mlt_frame_properties( mlt_frame this )
 
 int mlt_frame_is_test_card( mlt_frame this )
 {
-       return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" );
+       return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_image" );
 }
 
-/** Check if we have a way to derive something than test audio.
+/** Check if we have a way to derive something other than test audio.
 */
 
 int mlt_frame_is_test_audio( mlt_frame this )
 {
-       return this->get_audio == NULL || mlt_properties_get_int( mlt_frame_properties( this ), "test_audio" );
+       return mlt_deque_count( this->stack_audio ) == 0 || mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "test_audio" );
 }
 
 /** Get the aspect ratio of the frame.
@@ -102,7 +96,7 @@ int mlt_frame_is_test_audio( mlt_frame this )
 
 double mlt_frame_get_aspect_ratio( mlt_frame this )
 {
-       return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" );
+       return mlt_properties_get_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio" );
 }
 
 /** Set the aspect ratio of the frame.
@@ -110,7 +104,7 @@ double mlt_frame_get_aspect_ratio( mlt_frame this )
 
 int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
 {
-       return mlt_properties_set_double( mlt_frame_properties( this ), "aspect_ratio", value );
+       return mlt_properties_set_double( MLT_FRAME_PROPERTIES( this ), "aspect_ratio", value );
 }
 
 /** Get the position of this frame.
@@ -118,7 +112,8 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
 
 mlt_position mlt_frame_get_position( mlt_frame this )
 {
-       return mlt_properties_get_position( mlt_frame_properties( this ), "_position" );
+       int pos = mlt_properties_get_position( MLT_FRAME_PROPERTIES( this ), "_position" );
+       return pos < 0 ? 0 : pos;
 }
 
 /** Set the position of this frame.
@@ -126,7 +121,7 @@ mlt_position mlt_frame_get_position( mlt_frame this )
 
 int mlt_frame_set_position( mlt_frame this, mlt_position value )
 {
-       return mlt_properties_set_position( mlt_frame_properties( this ), "_position", value );
+       return mlt_properties_set_position( MLT_FRAME_PROPERTIES( this ), "_position", value );
 }
 
 /** Stack a get_image callback.
@@ -134,7 +129,7 @@ int mlt_frame_set_position( mlt_frame this, mlt_position value )
 
 int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
 {
-       return mlt_deque_push_back( this->stack_get_image, get_image );
+       return mlt_deque_push_back( this->stack_image, get_image );
 }
 
 /** Pop a get_image callback.
@@ -142,7 +137,7 @@ int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
 
 mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
 {
-       return mlt_deque_pop_back( this->stack_get_image );
+       return mlt_deque_pop_back( this->stack_image );
 }
 
 /** Push a frame.
@@ -150,7 +145,7 @@ mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
 
 int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
 {
-       return mlt_deque_push_back( this->stack_frame, that );
+       return mlt_deque_push_back( this->stack_image, that );
 }
 
 /** Pop a frame.
@@ -158,22 +153,120 @@ int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
 
 mlt_frame mlt_frame_pop_frame( mlt_frame this )
 {
-       return mlt_deque_pop_back( this->stack_frame );
+       return mlt_deque_pop_back( this->stack_image );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service( mlt_frame this, void *that )
+{
+       return mlt_deque_push_back( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+void *mlt_frame_pop_service( mlt_frame this )
+{
+       return mlt_deque_pop_back( this->stack_image );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service_int( mlt_frame this, int that )
+{
+       return mlt_deque_push_back_int( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+int mlt_frame_pop_service_int( mlt_frame this )
+{
+       return mlt_deque_pop_back_int( this->stack_image );
+}
+
+/** Push an audio item on the stack.
+*/
+
+int mlt_frame_push_audio( mlt_frame this, void *that )
+{
+       return mlt_deque_push_back( this->stack_audio, that );
+}
+
+/** Pop an audio item from the stack
+*/
+
+void *mlt_frame_pop_audio( mlt_frame this )
+{
+       return mlt_deque_pop_back( this->stack_audio );
 }
 
+/** Return the service stack
+*/
+
+mlt_deque mlt_frame_service_stack( mlt_frame this )
+{
+       return this->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.
+
+       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...
+*/
+
+void mlt_frame_replace_image( mlt_frame this, 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;
+}
+
+/** Get the image associated to the frame.
+*/
+
 int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
-       mlt_properties properties = mlt_frame_properties( this );
+       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 )
        {
-               return get_image( this, buffer, format, width, height, writable );
+               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 );
        }
        else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
        {
-               *format = mlt_image_yuv422;
+               *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" );
@@ -181,18 +274,19 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
        else if ( producer != NULL )
        {
                mlt_frame test_frame = NULL;
-               mlt_service_get_frame( mlt_producer_service( producer ), &test_frame, 0 );
+               mlt_service_get_frame( MLT_PRODUCER_SERVICE( producer ), &test_frame, 0 );
                if ( test_frame != NULL )
                {
-                       mlt_properties test_properties = mlt_frame_properties( 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_double( test_properties, "consumer_scale", mlt_properties_get_double( properties, "consumer_scale" ) );
-                       mlt_properties_set( test_properties, "rescale.interp", "nearest" );
+                       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 ) );
                }
                else
                {
@@ -202,16 +296,18 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
        }
        else
        {
-               uint8_t *p;
-               uint8_t *q;
+               register uint8_t *p;
+               register uint8_t *q;
                int size = 0;
 
                *width = *width == 0 ? 720 : *width;
                *height = *height == 0 ? 576 : *height;
                size = *width * *height;
 
+               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 );
 
                switch( *format )
                {
@@ -227,6 +323,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                                        memset( *buffer, 255, size );
                                break;
                        case mlt_image_rgb24a:
+                       case mlt_image_opengl:
                                size *= 4;
                                size += *width * 4;
                                *buffer = mlt_pool_alloc( size );
@@ -241,7 +338,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                                q = p + size;
                                while ( p != NULL && p != q )
                                {
-                                       *p ++ = 255;
+                                       *p ++ = 235;
                                        *p ++ = 128;
                                }
                                break;
@@ -257,23 +354,50 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for
                mlt_properties_set_int( properties, "test_image", 1 );
        }
 
-       return 0;
+       mlt_properties_set_int( properties, "scaled_width", *width );
+       mlt_properties_set_int( properties, "scaled_height", *height );
+
+       return error;
 }
 
 uint8_t *mlt_frame_get_alpha_mask( mlt_frame this )
 {
-       if ( this->get_alpha_mask != NULL )
-               return this->get_alpha_mask( this );
-       return NULL;
+       uint8_t *alpha = NULL;
+       if ( this != NULL )
+       {
+               if ( this->get_alpha_mask != NULL )
+                       alpha = this->get_alpha_mask( this );
+               if ( alpha == NULL )
+                       alpha = mlt_properties_get_data( &this->parent, "alpha", NULL );
+               if ( alpha == NULL )
+               {
+                       int size = mlt_properties_get_int( &this->parent, "scaled_width" ) * mlt_properties_get_int( &this->parent, "scaled_height" );
+                       alpha = mlt_pool_alloc( size );
+                       memset( alpha, 255, size );
+                       mlt_properties_set_data( &this->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 )
 {
-       mlt_properties properties = mlt_frame_properties( this );
+       mlt_get_audio get_audio = mlt_frame_pop_audio( this );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+       int hide = mlt_properties_get_int( properties, "test_audio" );
 
-       if ( this->get_audio != NULL )
+       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 );
+       }
+       else if ( mlt_properties_get_data( properties, "audio", NULL ) )
        {
-               return this->get_audio( this, buffer, format, frequency, channels, samples );
+               *buffer = mlt_properties_get_data( properties, "audio", NULL );
+               *frequency = mlt_properties_get_int( properties, "audio_frequency" );
+               *channels = mlt_properties_get_int( properties, "audio_channels" );
+               *samples = mlt_properties_get_int( properties, "audio_samples" );
        }
        else
        {
@@ -288,31 +412,140 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
                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" ) )
+       {
+               double value = mlt_properties_get_double( properties, "meta.volume" );
+
+               if ( value == 0.0 )
+               {
+                       memset( *buffer, 0, *samples * *channels * 2 );
+               }
+               else if ( value != 1.0 )
+               {
+                       int total = *samples * *channels;
+                       int16_t *p = *buffer;
+                       while ( total -- )
+                       {
+                               *p = *p * value;
+                               p ++;
+                       }
+               }
+
+               mlt_properties_set( properties, "meta.volume", NULL );
+       }
+
        return 0;
 }
 
-void mlt_frame_close( mlt_frame this )
+unsigned char *mlt_frame_get_waveform( mlt_frame this, 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?
+       int channels = 2;
+       double fps = mlt_profile_fps( NULL );
+       int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) );
+
+       // Get the pcm data
+       mlt_frame_get_audio( this, &pcm, &format, &frequency, &channels, &samples );
+
+       // Make an 8-bit buffer large enough to hold rendering
+       int size = w * h;
+       unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size );
+       if ( bitmap != NULL )
+               memset( bitmap, 0, size );
+       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 i, j, k;
+
+       // Iterate sample stream and along x coordinate
+       for ( i = 0; i < w && pcm < ubound; i++ )
+       {
+               // pcm data has channels interleaved
+               for ( j = 0; j < channels; j++ )
+               {
+                       // 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;
+                       // Position buffer pointer using y coordinate, stride, and x coordinate
+                       unsigned char *p = &bitmap[ i + displacement * w ];
+
+                       // Draw vertical line
+                       for ( k = 0; k < height; k++ )
+                               p[ w * k ] = 0xFF;
+
+                       pcm++;
+               }
+               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_get_image );
-               mlt_deque_close( this->stack_frame );
+               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 *****/
-#define RGB2YUV(r, g, b, y, u, v)\
-  y = (306*r + 601*g + 117*b)  >> 10;\
-  u = ((-172*r - 340*g + 512*b) >> 10)  + 128;\
-  v = ((512*r - 429*g - 83*b) >> 10) + 128;\
-  y = y < 0 ? 0 : y;\
-  u = u < 0 ? 0 : u;\
-  v = v < 0 ? 0 : v;\
-  y = y > 255 ? 255 : y;\
-  u = u > 255 ? 255 : u;\
-  v = v > 255 ? 255 : v
+
+int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total )
+{
+       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;
+}
 
 int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
 {
@@ -322,6 +555,7 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
        register uint8_t *d = yuv;
        register int i, j;
 
+       if ( alpha )
        for ( i = 0; i < height; i++ )
        {
                register uint8_t *s = rgba + ( stride * i );
@@ -353,6 +587,39 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri
                        *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;
 }
 
@@ -395,6 +662,195 @@ int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride
        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;
+}
+
+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;
+}
+
 int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv )
 {
        int ret = 0;
@@ -424,93 +880,88 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
        return ret;
 }
 
-void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight )
+uint8_t *mlt_resize_alpha( uint8_t *input, int owidth, int oheight, int iwidth, int iheight, uint8_t alpha_value )
 {
-       // Calculate strides
-       int istride = iwidth * 2;
-       int ostride = owidth * 2;
+       uint8_t *output = NULL;
 
-       iwidth = iwidth - ( iwidth % 4 );
-       owidth = owidth - ( owidth % 4 );
-       iheight = iheight - ( iheight % 2 );
-       oheight = oheight - ( oheight % 2 );
+       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;
 
-       // Optimisation point
-       if ( iwidth == owidth && iheight == oheight )
-               memcpy( output, input, iheight * istride );
+               output = mlt_pool_alloc( owidth * oheight );
+               memset( output, alpha_value, owidth * oheight );
+
+               offset_x -= offset_x % 2;
 
-       // Coordinates (0,0 is middle of output)
-       int y;
+               out_line = output + offset_y * owidth;
+               out_line += offset_x;
 
-       // Calculate ranges
-       int out_x_range = owidth / 2;
-       int out_y_range = oheight / 2;
-       int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
-       int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
+               // Loop for the entirety of our output height.
+               while ( iheight -- )
+               {
+                       // We're in the input range for this row.
+                       memcpy( out_line, input, iused );
 
-       // Output pointers
-       uint8_t *out_line = output;
-       uint8_t *out_ptr = out_line;
+                       // Move to next input line
+                       input += iwidth;
 
-       // Calculate a middle and possibly invalid pointer in the input
-       uint8_t *in_middle = input + istride * ( iheight / 2 ) + ( iwidth / 2 ) * 2;
-       int in_line = - in_y_range * istride - in_x_range * 2;
+                       // Move to next output line
+                       out_line += owidth;
+               }
+       }
+
+       return output;
+}
+
+void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight )
+{
+       // 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;
 
-       int elements;
+       // 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;
+       }
 
-       // Fill whole section with black
-       y = out_y_range - ( iheight / 2 );
-       int blank_elements = ostride * y / 2;
-       elements = blank_elements;
-       while ( elements -- )
+       while( size -- )
        {
-               *out_line ++ = 0;
-               *out_line ++ = 128;
+               *p ++ = 16;
+               *p ++ = 128;
        }
 
-       int active_width = 2 * iwidth;
-       int inactive_width = out_x_range - in_x_range;
+       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 -- )
        {
-               // Start at the beginning of the line
-               out_ptr = out_line;
-
-               // Fill the outer part with black
-               elements = inactive_width;
-               while ( elements -- )
-               {
-                       *out_ptr ++ = 0;
-                       *out_ptr ++ = 128;
-               }
-
                // We're in the input range for this row.
-               memcpy( out_ptr, in_middle + in_line, active_width );
-               out_ptr += active_width;
-
-               // Fill the outer part with black
-               elements = inactive_width;
-               while ( elements -- )
-               {
-                       *out_ptr ++ = 0;
-                       *out_ptr ++ = 128;
-               }
+               memcpy( out_line, in_line, iwidth * 2 );
 
-               // Move to next input line
-               in_line += istride;
+               // Move to next input line
+               in_line += istride;
 
-               // Move to next output line
-               out_line += ostride;
+               // Move to next output line
+               out_line += ostride;
        }
-
-       // Fill whole section with black
-       elements = blank_elements;
-       while ( elements -- )
-       {
-               *out_line ++ = 0;
-               *out_line ++ = 128;
-       }
 }
 
 /** A resizing function for yuv422 frames - this does not rescale, but simply
@@ -520,16 +971,20 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input
 uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 {
        // Get properties
-       mlt_properties properties = mlt_frame_properties( this );
+       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 )
        {
+               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 );
 
@@ -541,6 +996,14 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
                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;
        }
@@ -555,7 +1018,7 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight )
 uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 {
        // Get properties
-       mlt_properties properties = mlt_frame_properties( this );
+       mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 
        // Get the input image, width and height
        uint8_t *input = mlt_properties_get_data( properties, "image", NULL );
@@ -574,9 +1037,6 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 
                iwidth = iwidth - ( iwidth % 4 );
 
-       // Coordinates (0,0 is middle of output)
-       int y, x;
-
                // Derived coordinates
                int dy, dx;
 
@@ -587,41 +1047,44 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
        int in_y_range = iheight / 2;
 
        // Output pointers
-       uint8_t *out_line = output;
-       uint8_t *out_ptr;
+       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;
-               uint8_t *in_ptr;
 
                // Generate the affine transform scaling values
-               int scale_width = ( iwidth << 16 ) / owidth;
-               int scale_height = ( iheight << 16 ) / oheight;
+               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 ( y = - out_y_range; y < out_y_range ; y ++ )
+       for ( dy = - bottom; dy < bottom; dy += scale_height )
        {
-                       // Calculate the derived y value
-                       dy = ( scale_height * y ) >> 16;
-
                // Start at the beginning of the line
                out_ptr = out_line;
-       
+
                // Pointer to the middle of the input line
-               in_line = in_middle + dy * istride;
-       
+               in_line = in_middle + ( dy >> 16 ) * istride;
+
                // Loop for the entirety of our output row.
-               for ( x = - out_x_range; x < out_x_range; x += 1 )
+               for ( dx = - outer; dx < outer; dx += scale_width )
                {
-                               // Calculated the derived x
-                               dx = ( scale_width * x ) >> 16;
-
-                       // We're in the input range for this row.
-                               in_ptr = in_line + ( dx << 1 );
-                       *out_ptr ++ = *in_ptr ++;
-                               in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1;
-                       *out_ptr ++ = *in_ptr;
+                               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
@@ -644,22 +1107,26 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight )
 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 *p_src, *p_dest;
        int16_t *src, *dest;
-       //static int16_t *extra_src = NULL, *extra_dest = NULL;
-       static int extra_src_samples = 0, extra_dest_samples = 0;
        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( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
-       //fprintf( stderr, "mix: frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "_position" ) );
-       mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src );
-       //fprintf( stderr, "mix: frame src  samples %d channels %d\n", samples_src, channels_src );
-       src = p_src;
-       dest = p_dest;
+       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 )
@@ -669,40 +1136,25 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
        if ( samples_dest > 4000 )
                samples_dest = 0;
 
-#if 0
-       // Append new samples to leftovers
-       if ( extra_dest_samples > 0 )
-       {
-               fprintf( stderr, "prepending %d samples to dest\n", extra_dest_samples );
-               dest = realloc( extra_dest, ( samples_dest + extra_dest_samples ) * 2 * channels_dest );
-               memcpy( &extra_dest[ extra_dest_samples * channels_dest ], p_dest, samples_dest * 2 * channels_dest );
-       }
-       else
-               dest = p_dest;
-       if ( extra_src_samples > 0 )
-       {
-               fprintf( stderr, "prepending %d samples to src\n", extra_src_samples );
-               src = realloc( extra_src, ( samples_src + extra_src_samples ) * 2 * channels_src );
-               memcpy( &extra_src[ extra_src_samples * channels_src ], p_src, samples_src * 2 * channels_src );
-       }
-       else
-               src = p_src;
-#endif
-
-       // determine number of samples to process       
-       if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
-               *samples = samples_src + extra_src_samples;
-       else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
-               *samples = samples_dest + extra_dest_samples;
-       
+       // 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 = p_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 )
+       {
+               *samples = samples_src;
+               *channels = channels_src;
+               *buffer = src;
+               *frequency = frequency_src;
+               return ret;
+       }
+
        // Mixdown
        for ( i = 0; i < *samples; i++ )
        {
@@ -717,48 +1169,80 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight_start, flo
                weight += weight_step;
        }
 
-       // We have to copy --sigh
-       if ( dest != p_dest )
-               memcpy( p_dest, dest, *samples * 2 * *channels );
+       return ret;
+}
+
+// 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 )
+{
+       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 ) );
 
-#if 0
-       // Store the leftovers
-       if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
+       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 )
        {
-               extra_dest_samples = ( samples_dest + extra_dest_samples ) - ( samples_src + extra_src_samples );
-               size_t size = extra_dest_samples * 2 * channels_dest;
-               fprintf( stderr, "storing %d samples from dest\n", extra_dest_samples );
-               if ( extra_dest )
-                       free( extra_dest );
-               extra_dest = malloc( size );
-               if ( extra_dest )
-                       memcpy( extra_dest, &p_dest[ ( samples_dest - extra_dest_samples - 1 ) * channels_dest ], size );
-               else
-                       extra_dest_samples = 0;
-       }
-       else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
-       {
-               extra_src_samples = ( samples_src + extra_src_samples ) - ( samples_dest + extra_dest_samples );
-               size_t size = extra_src_samples * 2 * channels_src;
-               fprintf( stderr, "storing %d samples from src\n", extra_dest_samples );
-               if ( extra_src )
-                       free( extra_src );
-               extra_src = malloc( size );
-               if ( extra_src )
-                       memcpy( extra_src, &p_src[ ( samples_src - extra_src_samples - 1 ) * channels_src ], size );
-               else
-                       extra_src_samples = 0;
+               *samples = samples_src;
+               *channels = channels_src;
+               *buffer = src;
+               *frequency = frequency_src;
+               return ret;
        }
-#endif
-       
+
+       // 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;
+
+       for ( j = 0; j < *channels; j++ )
+               vp[ j ] = ( double )dest[ j ];
+
+       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++ )
+       {
+               for ( j = 0; j < *channels; j++ )
+               {
+                       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 );
+               }
+       }
+
        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 ( fps > 29 && fps <= 30 )
+       if ( ( int )( fps * 100 ) == 2997 )
        {
                samples = frequency / 30;
 
@@ -800,3 +1284,31 @@ int mlt_sample_calculator( float fps, int frequency, int64_t position )
        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;
+               }
+       }
+       else if ( fps != 0 )
+       {
+               samples = ( ( frame * frequency ) / ( int )fps );
+       }
+
+       return samples;
+}