some temporary fixes

[melted] / mlt / src / framework / mlt_frame.c

diff --git a/mlt/src/framework/mlt_frame.c b/mlt/src/framework/mlt_frame.c
index 3b11fcf..1c36cf0 100644 (file)
--- a/mlt/src/framework/mlt_frame.c
+++ b/mlt/src/framework/mlt_frame.c
@@ -53,7 +53,7 @@ mlt_frame mlt_frame_init( )
                mlt_properties_init( properties, this );
 
                // Set default properties on the frame
-               mlt_properties_set_timecode( properties, "timecode", 0.0 );
+               mlt_properties_set_position( properties, "position", 0.0 );
                mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL );
                mlt_properties_set_int( properties, "width", 720 );
                mlt_properties_set_int( properties, "height", 576 );
@@ -77,7 +77,15 @@ mlt_properties mlt_frame_properties( mlt_frame this )
 
 int mlt_frame_is_test_card( mlt_frame this )
 {
-       return this->stack_get_image_size == 0;
+       return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL );
+}
+
+/** Check if we have a way to derive something than test audio.
+*/
+
+int mlt_frame_is_test_audio( mlt_frame this )
+{
+       return this->get_audio == NULL;
 }
 
 /** Get the aspect ratio of the frame.
@@ -98,22 +106,22 @@ int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
        return mlt_properties_set_double( properties, "aspect_ratio", value );
 }
 
-/** Get the timecode of this frame.
+/** Get the position of this frame.
 */
 
-mlt_timecode mlt_frame_get_timecode( mlt_frame this )
+mlt_position mlt_frame_get_position( mlt_frame this )
 {
        mlt_properties properties = mlt_frame_properties( this );
-       return mlt_properties_get_timecode( properties, "timecode" );
+       return mlt_properties_get_position( properties, "position" );
 }
 
-/** Set the timecode of this frame.
+/** Set the position of this frame.
 */
 
-int mlt_frame_set_timecode( mlt_frame this, mlt_timecode value )
+int mlt_frame_set_position( mlt_frame this, mlt_position value )
 {
        mlt_properties properties = mlt_frame_properties( this );
-       return mlt_properties_set_timecode( properties, "timecode", value );
+       return mlt_properties_set_position( properties, "position", value );
 }
 
 /** Stack a get_image callback.
@@ -245,7 +253,7 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for
                        *channels = 2;
                if ( *frequency <= 0 )
                        *frequency = 48000;
-               if ( test_card.afmt != *format )
+               if ( test_card.audio == NULL || test_card.afmt != *format )
                {
                        test_card.afmt = *format;
                        test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) );
@@ -397,9 +405,9 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int
 int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight )
 {
        int ret = 0;
-       int width_src, height_src;
-       int width_dest, height_dest;
-       mlt_image_format format_src, format_dest;
+       int width_src = 0, height_src = 0;
+       int width_dest = 0, height_dest = 0;
+       mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
        uint8_t *p_src, *p_dest;
        int i, j;
        int stride_src;
@@ -412,10 +420,15 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float
 
        format_src = mlt_image_yuv422;
        format_dest = mlt_image_yuv422;
-       
+
+       //fprintf( stderr, "call get_image on frame a\n"), fflush( stderr );
        mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
+       //fprintf( stderr, "call get_image on frame b\n"), fflush( stderr );
        mlt_frame_get_image( that, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
-       
+
+       //fprintf( stderr, "mlt_frame_composite_yuv %dx%d -> %dx%d\n", width_src, height_src, width_dest, height_dest );
+       //fflush(stderr);
+       //return ret;
        stride_src = width_src * 2;
        stride_dest = width_dest * 2;
        
@@ -486,8 +499,23 @@ int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float
 void *memfill( void *dst, void *src, int l, int elements )
 {
        int i = 0;
-       for ( i = 0; i < elements; i ++ )
-               dst = memcpy( dst, src, l ) + l;
+       if ( l == 2 )
+       {
+               uint8_t *p = dst;
+               uint8_t *src1 = src;
+               uint8_t *src2 = src + 1;
+               for ( i = 0; i < elements; i ++ )
+               {
+                       *p ++ = *src1;
+                       *p ++ = *src2;
+               }
+               dst = p;
+       }
+       else
+       {
+               for ( i = 0; i < elements; i ++ )
+                       dst = memcpy( dst, src, l ) + l;
+       }
        return dst;
 }
 
@@ -696,18 +724,25 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
        int ret = 0;
        int16_t *p_src, *p_dest;
        int16_t *src, *dest;
-       static int16_t *extra_src = NULL, *extra_dest = NULL;
+       //static int16_t *extra_src = NULL, *extra_dest = NULL;
        static int extra_src_samples = 0, extra_dest_samples = 0;
-       int frequency_src, frequency_dest;
-       int channels_src, channels_dest;
-       int samples_src, samples_dest;
+       int frequency_src = 0, frequency_dest = 0;
+       int channels_src = 0, channels_dest = 0;
+       int samples_src = 0, samples_dest = 0;
        int i, j;
 
        mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
+       //fprintf( stderr, "frame dest samples %d channels %d position %f\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, "frame dest samples %d channels %d\n", samples_dest, channels_dest );
        //fprintf( stderr, "frame src  samples %d channels %d\n", samples_src, channels_src );
-       
+       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;
 
 #if 0
        // Append new samples to leftovers