move audio sample calculator to mlt_frame and use from ffmpeg and mcmpeg, add mlt_fra...

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

diff --git a/mlt/src/framework/mlt_frame.h b/mlt/src/framework/mlt_frame.h
index 35dc53d..175df0a 100644 (file)
--- a/mlt/src/framework/mlt_frame.h
+++ b/mlt/src/framework/mlt_frame.h
@@ -86,10 +86,13 @@ extern void mlt_frame_close( mlt_frame this );
 /* convenience functions */
 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_sample_calculator( float fps, int frequency, int64_t position );
 
 #endif