X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.h;h=ee11626a3a1c7937c2444e6381b2cdad117258f9;hb=978543a20e47302b82bc29007852bff8180031c2;hp=58476d546d1816c621a7152a44575b567ca582d2;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h index 58476d5..ee11626 100644 --- a/src/framework/mlt_frame.h +++ b/src/framework/mlt_frame.h @@ -68,6 +68,7 @@ struct mlt_frame_s extern mlt_frame mlt_frame_init( ); extern mlt_properties mlt_frame_properties( mlt_frame this ); extern int mlt_frame_is_test_card( mlt_frame this ); +extern int mlt_frame_is_test_audio( mlt_frame this ); extern double mlt_frame_get_aspect_ratio( mlt_frame this ); extern int mlt_frame_set_aspect_ratio( mlt_frame this, double value ); extern mlt_position mlt_frame_get_position( mlt_frame this ); @@ -87,11 +88,10 @@ extern void mlt_frame_close( mlt_frame this ); extern int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha ); extern int mlt_convert_rgb24_to_yuv422( uint8_t *rgb, int width, int height, int stride, uint8_t *yuv ); extern int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int stride, uint8_t *yuv ); -extern int mlt_frame_composite_yuv( mlt_frame this, mlt_frame that, int x, int y, float weight ); extern uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ); extern uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ); extern void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight ); -extern 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 ); +extern 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 ); extern int mlt_sample_calculator( float fps, int frequency, int64_t position ); #endif