producer_colour

[melted] / src / framework / mlt_frame.h

diff --git a/src/framework/mlt_frame.h b/src/framework/mlt_frame.h
index 58476d5..a35086e 100644 (file)
--- a/src/framework/mlt_frame.h
+++ b/src/framework/mlt_frame.h
@@ -22,6 +22,7 @@
 #define _MLT_FRAME_H_
 
 #include "mlt_properties.h"
+#include "mlt_deque.h"
 
 typedef enum
 {
@@ -59,15 +60,15 @@ struct mlt_frame_s
        uint8_t * ( *get_alpha_mask )( mlt_frame this );
        
        // Private properties
-       mlt_get_image stack_get_image[ 10 ];
-       int stack_get_image_size;
-       mlt_frame stack_frame[ 10 ];
-       int stack_frame_size;
+       mlt_deque stack_get_image;
+       mlt_deque stack_frame;
+       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 );
@@ -81,18 +82,43 @@ 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 );
 
 /* 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_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