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 );
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.
double mlt_frame_get_aspect_ratio( mlt_frame this )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_get_double( properties, "aspect_ratio" );
+ return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" );
}
/** Set the aspect ratio of the frame.
int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_set_double( properties, "aspect_ratio", value );
+ return mlt_properties_set_double( mlt_frame_properties( this ), "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( mlt_frame_properties( this ), "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( mlt_frame_properties( this ), "position", value );
}
/** Stack a get_image callback.
}
else
{
- if ( test_card.afmt != *format )
+ if ( *samples <= 0 )
+ *samples = 1920;
+ if ( *channels <= 0 )
+ *channels = 2;
+ if ( *frequency <= 0 )
+ *frequency = 48000;
+ if ( test_card.audio == NULL || test_card.afmt != *format )
{
test_card.afmt = *format;
- test_card.audio = realloc( test_card.audio, 1920 * 2 * sizeof( int16_t ) );
- memset( test_card.audio, 0, 1920 * 2 * sizeof( int16_t ) );
+ test_card.audio = realloc( test_card.audio, *samples * *channels * sizeof( int16_t ) );
+ memset( test_card.audio, 0, *samples * *channels * sizeof( int16_t ) );
}
*buffer = test_card.audio;
- *frequency = 48000;
- *channels = 2;
- *samples = 1920;
}
return 0;
}
void mlt_frame_close( mlt_frame this )
{
- mlt_frame frame = mlt_frame_pop_frame( this );
-
- while ( frame != NULL )
- {
- mlt_frame_close( frame);
- frame = mlt_frame_pop_frame( this );
- }
-
mlt_properties_close( &this->parent );
-
free( this );
}
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;
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;
if ( p_alpha )
p_alpha += x_src + y_src * stride_src / 2;
+ uint8_t *p = p_src;
+ uint8_t *q = p_dest;
+ uint8_t *o = p_dest;
+ uint8_t *z = p_alpha;
+
+ uint8_t Y;
+ uint8_t UV;
+ uint8_t a;
+ float value;
+
// now do the compositing only to cropped extents
for ( i = 0; i < height_src; i++ )
{
- uint8_t *p = p_src;
- uint8_t *q = p_dest;
- uint8_t *o = p_dest;
- uint8_t *z = p_alpha;
+ p = p_src;
+ q = p_dest;
+ o = p_dest;
+ z = p_alpha;
for ( j = 0; j < width_src; j ++ )
{
- uint8_t y = *p ++;
- uint8_t uv = *p ++;
- uint8_t a = ( z == NULL ) ? 255 : *z ++;
- float value = ( weight * ( float ) a / 255.0 );
- *o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
- *o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
+ Y = *p ++;
+ UV = *p ++;
+ a = ( z == NULL ) ? 255 : *z ++;
+ value = ( weight * ( float ) a / 255.0 );
+ *o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
+ *o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
}
p_src += stride_src;
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;
}
return input;
}
+int mlt_frame_mix_audio( mlt_frame this, mlt_frame that, float weight, 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 = 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 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
+ 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;
+#else
+ src = p_src;
+ dest = p_dest;
+#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;
+
+ *channels = channels_src < channels_dest ? channels_src : channels_dest;
+ *buffer = p_dest;
+
+ // Mixdown
+ for ( i = 0; i < *samples; i++ )
+ {
+ for ( j = 0; j < *channels; j++ )
+ {
+ double d = (double) dest[ i * channels_dest + j ];
+ double s = (double) src[ i * channels_src + j ];
+ dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
+ }
+ }
+
+ // We have to copy --sigh
+ if ( dest != p_dest )
+ memcpy( p_dest, dest, *samples * 2 * *channels );
+
+#if 0
+ // Store the leftovers
+ if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
+ {
+ 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;
+ }
+#endif
+
+ return ret;
+}
+
+int mlt_sample_calculator( float fps, int frequency, int64_t position )
+{
+ int samples = 0;
+
+ if ( fps > 29 && fps <= 30 )
+ {
+ samples = frequency / 30;
+
+ switch ( frequency )
+ {
+ 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;
+}
+