X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Fframework%2Fmlt_frame.c;h=f2fad14caaca6f9cde5849f2e7a0949e962a3579;hb=89b7e06e362f01284cd1166a019ae3fa3093a6e4;hp=64ec68dfd194c8c96c26f2e99d380ad0c024f6f6;hpb=f5778b64f410f048403d510c1f950e3ac5132734;p=melted

diff --git a/mlt/src/framework/mlt_frame.c b/mlt/src/framework/mlt_frame.c
index 64ec68d..f2fad14 100644
--- 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 );
@@ -98,22 +98,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 +245,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 ) );
@@ -491,8 +491,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;
 }
 
@@ -701,7 +716,7 @@ 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 = 0, frequency_dest = 0;
 	int channels_src = 0, channels_dest = 0;
@@ -709,7 +724,7 @@ int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, int16_t *
 	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 timecode %f\n", samples_dest, channels_dest, mlt_properties_get_timecode( mlt_frame_properties( this ), "timecode" ) );
+	//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 src  samples %d channels %d\n", samples_src, channels_src );
 	if ( channels_src > 6 )