X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=6424a5477eaa56eecd4f1c9eb998f88fd4580fce;hb=467f981c523481500c5df1a12c4cf6f586c11ace;hp=03a5e22d69cfa084459f5ced85ef0b206f2563c8;hpb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 03a5e22..6424a54 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -18,10 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" #include "mlt_frame.h" #include "mlt_producer.h" #include "mlt_factory.h" +#include "mlt_profile.h" + #include #include #include @@ -30,15 +31,14 @@ /** Constructor for a frame. */ -mlt_frame mlt_frame_init( ) +mlt_frame mlt_frame_init( mlt_service service ) { // Allocate a frame mlt_frame this = calloc( sizeof( struct mlt_frame_s ), 1 ); if ( this != NULL ) { - // Get the normalisation - char *normalisation = mlt_environment( "MLT_NORMALISATION" ); + mlt_profile profile = mlt_service_profile( service ); // Initialise the properties mlt_properties properties = &this->parent; @@ -47,24 +47,11 @@ mlt_frame mlt_frame_init( ) // Set default properties on the frame mlt_properties_set_position( properties, "_position", 0.0 ); mlt_properties_set_data( properties, "image", NULL, 0, NULL, NULL ); - - if ( normalisation == NULL || strcmp( normalisation, "NTSC" ) ) - { - mlt_properties_set_int( properties, "width", 720 ); - mlt_properties_set_int( properties, "height", 576 ); - mlt_properties_set_int( properties, "normalised_width", 720 ); - mlt_properties_set_int( properties, "normalised_height", 576 ); - mlt_properties_set_double( properties, "aspect_ratio", 59.0/54.0 ); - } - else - { - mlt_properties_set_int( properties, "width", 720 ); - mlt_properties_set_int( properties, "height", 480 ); - mlt_properties_set_int( properties, "normalised_width", 720 ); - mlt_properties_set_int( properties, "normalised_height", 480 ); - mlt_properties_set_double( properties, "aspect_ratio", 10.0/11.0 ); - } - + mlt_properties_set_int( properties, "width", profile? profile->width : 720 ); + mlt_properties_set_int( properties, "height", profile? profile->height : 576 ); + mlt_properties_set_int( properties, "normalised_width", profile? profile->width : 720 ); + mlt_properties_set_int( properties, "normalised_height", profile? profile->height : 576 ); + mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( NULL ) ); mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL ); @@ -459,7 +446,7 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) mlt_audio_format format = mlt_audio_pcm; int frequency = 32000; // lower frequency available? int channels = 2; - double fps = mlt_properties_get_double( properties, "fps" ); + double fps = mlt_profile_fps( NULL ); int samples = mlt_sample_calculator( fps, frequency, mlt_frame_get_position( this ) ); // Get the pcm data @@ -565,6 +552,7 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri register uint8_t *d = yuv; register int i, j; + if ( alpha ) for ( i = 0; i < height; i++ ) { register uint8_t *s = rgba + ( stride * i ); @@ -596,6 +584,39 @@ int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stri *d++ = u0; } } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + r = *s++; + g = *s++; + b = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } + return ret; } @@ -646,6 +667,7 @@ int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stri register uint8_t *d = yuv; register int i, j; + if ( alpha ) for ( i = 0; i < height; i++ ) { register uint8_t *s = rgba + ( stride * i ); @@ -677,6 +699,38 @@ int mlt_convert_bgr24a_to_yuv422( uint8_t *rgba, int width, int height, int stri *d++ = u0; } } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + b = *s++; + g = *s++; + r = *s++; + s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } return ret; } @@ -727,6 +781,7 @@ int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride register uint8_t *d = yuv; register int i, j; + if ( alpha ) for ( i = 0; i < height; i++ ) { register uint8_t *s = rgba + ( stride * i ); @@ -758,6 +813,38 @@ int mlt_convert_argb_to_yuv422( uint8_t *rgba, int width, int height, int stride *d++ = u0; } } + else + for ( i = 0; i < height; i++ ) + { + register uint8_t *s = rgba + ( stride * i ); + for ( j = 0; j < ( width / 2 ); j++ ) + { + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y1, u1 , v1); + *d++ = y0; + *d++ = (u0+u1) >> 1; + *d++ = y1; + *d++ = (v0+v1) >> 1; + } + if ( width % 2 ) + { + s++; + r = *s++; + g = *s++; + b = *s++; + RGB2YUV (r, g, b, y0, u0 , v0); + *d++ = y0; + *d++ = u0; + } + } return ret; }