X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.h;h=f81a453a1e0d3b99f40013494bc639373d545453;hb=9936fc1daf6f3e7eae88c6131474e2bee0c385f4;hp=a35086ed8db004f6e385b8e03b2adf41b3995427;hpb=6820dfa615e2f55eb4ef17327c2cd293605c3389;p=melted

diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h
index a35086e..f81a453 100644
--- a/src/framework/mlt_frame.h
+++ b/src/framework/mlt_frame.h
@@ -24,31 +24,8 @@
 #include "mlt_properties.h"
 #include "mlt_deque.h"
 
-typedef enum
-{
-	mlt_image_none = 0,
-	mlt_image_rgb24,
-	mlt_image_rgb24a,
-	mlt_image_yuv422,
-	mlt_image_yuv420p
-}
-mlt_image_format;
-
-typedef enum
-{
-	mlt_video_standard_pal = 0,
-	mlt_video_standard_ntsc
-}
-mlt_video_standard;
-
-typedef enum
-{
-	mlt_audio_none = 0,
-	mlt_audio_pcm
-}
-mlt_audio_format;
-
-typedef int ( *mlt_get_image )( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
+typedef int ( *mlt_get_image )( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
+typedef int ( *mlt_get_audio )( mlt_frame self, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
 
 struct mlt_frame_s
 {
@@ -56,44 +33,54 @@ struct mlt_frame_s
 	struct mlt_properties_s parent;
 
 	// Virtual methods
-	int ( *get_audio )( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
-	uint8_t * ( *get_alpha_mask )( mlt_frame this );
+	uint8_t * ( *get_alpha_mask )( mlt_frame self );
 	
 	// Private properties
-	mlt_deque stack_get_image;
-	mlt_deque stack_frame;
+	mlt_deque stack_image;
+	mlt_deque stack_audio;
 	mlt_deque stack_service;
 };
 
-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 );
-extern int mlt_frame_set_position( mlt_frame this, mlt_position value );
-
-extern int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
-extern uint8_t *mlt_frame_get_alpha_mask( mlt_frame this );
-extern int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
+#define MLT_FRAME_PROPERTIES( frame )		( &( frame )->parent )
+#define MLT_FRAME_SERVICE_STACK( frame )	( ( frame )->stack_service )
+#define MLT_FRAME_IMAGE_STACK( frame )		( ( frame )->stack_image )
+#define MLT_FRAME_AUDIO_STACK( frame )		( ( frame )->stack_audio )
 
-extern int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image );
-extern mlt_get_image mlt_frame_pop_get_image( mlt_frame this );
-extern int mlt_frame_push_frame( mlt_frame this, mlt_frame that );
-extern mlt_frame mlt_frame_pop_frame( mlt_frame this );
-extern int mlt_frame_push_service( mlt_frame this, void *that );
-extern void *mlt_frame_pop_service( mlt_frame this );
-extern void mlt_frame_close( mlt_frame this );
+extern mlt_frame mlt_frame_init( );
+extern mlt_properties mlt_frame_properties( mlt_frame self );
+extern int mlt_frame_is_test_card( mlt_frame self );
+extern int mlt_frame_is_test_audio( mlt_frame self );
+extern double mlt_frame_get_aspect_ratio( mlt_frame self );
+extern int mlt_frame_set_aspect_ratio( mlt_frame self, double value );
+extern mlt_position mlt_frame_get_position( mlt_frame self );
+extern int mlt_frame_set_position( mlt_frame self, mlt_position value );
+extern void mlt_frame_replace_image( mlt_frame self, uint8_t *image, mlt_image_format format, int width, int height );
+extern int mlt_frame_get_image( mlt_frame self, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable );
+extern uint8_t *mlt_frame_get_alpha_mask( mlt_frame self );
+extern int mlt_frame_get_audio( mlt_frame self, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples );
+extern unsigned char *mlt_frame_get_waveform( mlt_frame self, int w, int h );
+extern int mlt_frame_push_get_image( mlt_frame self, mlt_get_image get_image );
+extern mlt_get_image mlt_frame_pop_get_image( mlt_frame self );
+extern int mlt_frame_push_frame( mlt_frame self, mlt_frame that );
+extern mlt_frame mlt_frame_pop_frame( mlt_frame self );
+extern int mlt_frame_push_service( mlt_frame self, void *that );
+extern void *mlt_frame_pop_service( mlt_frame self );
+extern int mlt_frame_push_service_int( mlt_frame self, int that );
+extern int mlt_frame_pop_service_int( mlt_frame self );
+extern int mlt_frame_push_audio( mlt_frame self, void *that );
+extern void *mlt_frame_pop_audio( mlt_frame self );
+extern mlt_deque mlt_frame_service_stack( mlt_frame self );
+extern mlt_producer mlt_frame_get_original_producer( mlt_frame self );
+extern void mlt_frame_close( mlt_frame self );
 
 /* 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 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 uint8_t *mlt_frame_resize_yuv422( mlt_frame self, int owidth, int oheight );
+extern uint8_t *mlt_frame_rescale_yuv422( mlt_frame self, 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_start, float weight_end, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples  );
+extern int mlt_frame_mix_audio( mlt_frame self, 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 );
 
 /* this macro scales rgb into the yuv gamut, y is scaled by 219/255 and uv by 224/255 */
@@ -121,4 +108,3 @@ extern int mlt_sample_calculator( float fps, int frequency, int64_t position );
   v = v > 240 ? 240 : v
 
 #endif
-