X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.h;h=e288c1b5ac39296606dc08ed219510ddc3d91a35;hb=2a800ec4c840132c7a629b764b673dce09771637;hp=915a707c1059fec35ef5815ce26b461975f153a5;hpb=037e09bc7cd1c94c73f200d2583dee5a786da810;p=melted

diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h
index 915a707..e288c1b 100644
--- a/src/framework/mlt_frame.h
+++ b/src/framework/mlt_frame.h
@@ -24,30 +24,6 @@
 #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 );
 
 struct mlt_frame_s
@@ -60,9 +36,8 @@ struct mlt_frame_s
 	uint8_t * ( *get_alpha_mask )( mlt_frame this );
 	
 	// Private properties
-	mlt_deque stack_get_image;
-	mlt_deque stack_frame;
-	mlt_deque stack_service;
+	mlt_deque stack_image;
+	mlt_deque stack_audio;
 };
 
 extern mlt_frame mlt_frame_init( );
@@ -73,17 +48,17 @@ 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 );
-
 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 int mlt_frame_push_audio( mlt_frame this, void *that );
+extern void *mlt_frame_pop_audio( mlt_frame this );
 extern void mlt_frame_close( mlt_frame this );
 
 /* convenience functions */
@@ -96,5 +71,29 @@ extern void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t
 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 );
 
+/* this macro scales rgb into the yuv gamut, y is scaled by 219/255 and uv by 224/255 */
+#define RGB2YUV(r, g, b, y, u, v)\
+  y = ((257*r + 504*g + 98*b) >> 10) + 16;\
+  u = ((-148*r - 291*g + 439*b) >> 10) + 128;\
+  v = ((439*r - 368*g - 71*b) >> 10) + 128;\
+  y = y < 16 ? 16 : y;\
+  u = u < 16 ? 16 : u;\
+  v = v < 16 ? 16 : v;\
+  y = y > 235 ? 235 : y;\
+  u = u > 240 ? 240 : u;\
+  v = v > 240 ? 240 : v
+
+/* this macro assumes the user has already scaled their rgb down into the broadcast limits */
+#define RGB2YUV_UNSCALED(r, g, b, y, u, v)\
+  y = (299*r + 587*g + 114*b) >> 10;\
+  u = ((-169*r - 331*g + 500*b) >> 10) + 128;\
+  v = ((500*r - 419*g - 81*b) >> 10) + 128;\
+  y = y < 16 ? 16 : y;\
+  u = u < 16 ? 16 : u;\
+  v = v < 16 ? 16 : v;\
+  y = y > 235 ? 235 : y;\
+  u = u > 240 ? 240 : u;\
+  v = v > 240 ? 240 : v
+
 #endif