X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=0899b06505cb292cc64da90b935129695504c3af;hb=d5d878221c3123ef1d3a335dbc2b1878b3fdb983;hp=9c6922b19f3c3ba1388c8dbb11aaa6320017a2ad;hpb=05b29b78bfb59b49836719573f4c7503066bad04;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 9c6922b..0899b06 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -1,27 +1,31 @@ -/* - * mlt_frame.c -- interface for all frame classes - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited - * Author: Charles Yates +/** + * \file mlt_frame.c + * \brief interface for all frame classes + * \see mlt_frame_s * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Copyright (C) 2003-2009 Ushodaya Enterprises Limited + * \author Charles Yates * - * This program is distributed in the hope that it will be useful, + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * 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 +34,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 +50,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 ); @@ -229,12 +219,12 @@ mlt_deque mlt_frame_service_stack( mlt_frame this ) of a composite where the b frame completely obscures the a frame). The image must be writable and the destructor for the image itself must be taken - care of on another frame and that frame cannot have a replace applied to it... + care of on another frame and that frame cannot have a replace applied to it... Further it assumes that no alpha mask is in use. - For these reasons, it can only be used in a specific situation - when you have + For these reasons, it can only be used in a specific situation - when you have multiple tracks each with their own transition and these transitions are applied - in a strictly reversed order (ie: highest numbered [lowest track] is processed + in a strictly reversed order (ie: highest numbered [lowest track] is processed first). More reliable approach - the cases should be detected during the process phase @@ -246,7 +236,7 @@ void mlt_frame_replace_image( mlt_frame this, uint8_t *image, mlt_image_format f // Remove all items from the stack while( mlt_deque_pop_back( this->stack_image ) ) ; - // Update the information + // Update the information mlt_properties_set_data( MLT_FRAME_PROPERTIES( this ), "image", image, 0, NULL, NULL ); mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "width", width ); mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "height", height ); @@ -459,24 +449,24 @@ 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 mlt_frame_get_audio( this, &pcm, &format, &frequency, &channels, &samples ); - + // Make an 8-bit buffer large enough to hold rendering int size = w * h; unsigned char *bitmap = ( unsigned char* )mlt_pool_alloc( size ); if ( bitmap != NULL ) memset( bitmap, 0, size ); mlt_properties_set_data( properties, "waveform", bitmap, size, ( mlt_destructor )mlt_pool_release, NULL ); - + // Render vertical lines int16_t *ubound = pcm + samples * channels; int skip = samples / w - 1; int i, j, k; - + // Iterate sample stream and along x coordinate for ( i = 0; i < w && pcm < ubound; i++ ) { @@ -485,7 +475,7 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) { // Determine sample's magnitude from 2s complement; int pcm_magnitude = *pcm < 0 ? ~(*pcm) + 1 : *pcm; - // The height of a line is the ratio of the magnitude multiplied by + // The height of a line is the ratio of the magnitude multiplied by // half the vertical resolution int height = ( int )( ( double )( pcm_magnitude ) / 32768 * h / 2 ); // Determine the starting y coordinate - left channel above center, @@ -493,11 +483,11 @@ unsigned char *mlt_frame_get_waveform( mlt_frame this, int w, int h ) int displacement = ( h / 2 ) - ( 1 - j ) * height; // Position buffer pointer using y coordinate, stride, and x coordinate unsigned char *p = &bitmap[ i + displacement * w ]; - + // Draw vertical line for ( k = 0; k < height; k++ ) p[ w * k ] = 0xFF; - + pcm++; } pcm += skip * channels; @@ -532,31 +522,24 @@ void mlt_frame_close( mlt_frame this ) int mlt_convert_yuv422_to_rgb24a( uint8_t *yuv, uint8_t *rgba, unsigned int total ) { int ret = 0; - int yy, uu, vv, ug_plus_vg, ub, vr; + int yy, uu, vv; int r,g,b; total /= 2; - while (total--) + while (total--) { - yy = yuv[0] << 8; - uu = yuv[1] - 128; - vv = yuv[3] - 128; - ug_plus_vg = uu * 88 + vv * 183; - ub = uu * 454; - vr = vv * 359; - r = (yy + vr) >> 8; - g = (yy - ug_plus_vg) >> 8; - b = (yy + ub) >> 8; - rgba[0] = r < 0 ? 0 : (r > 255 ? 255 : (unsigned char)r); - rgba[1] = g < 0 ? 0 : (g > 255 ? 255 : (unsigned char)g); - rgba[2] = b < 0 ? 0 : (b > 255 ? 255 : (unsigned char)b); + yy = yuv[0]; + uu = yuv[1]; + vv = yuv[3]; + YUV2RGB(yy, uu, vv, r, g, b); + rgba[0] = r; + rgba[1] = g; + rgba[2] = b; rgba[3] = 255; - yy = yuv[2] << 8; - r = (yy + vr) >> 8; - g = (yy - ug_plus_vg) >> 8; - b = (yy + ub) >> 8; - rgba[4] = r < 0 ? 0 : (r > 255 ? 255 : (unsigned char)r); - rgba[5] = g < 0 ? 0 : (g > 255 ? 255 : (unsigned char)g); - rgba[6] = b < 0 ? 0 : (b > 255 ? 255 : (unsigned char)b); + yy = yuv[2]; + YUV2RGB(yy, uu, vv, r, g, b); + rgba[4] = r; + rgba[5] = g; + rgba[6] = b; rgba[7] = 255; yuv += 4; rgba += 8; @@ -572,6 +555,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 ); @@ -603,6 +587,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; } @@ -653,6 +670,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 ); @@ -684,6 +702,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; } @@ -734,6 +784,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 ); @@ -765,6 +816,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; } @@ -984,7 +1067,7 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) { // Start at the beginning of the line out_ptr = out_line; - + // Pointer to the middle of the input line in_line = in_middle + ( dy >> 16 ) * istride; @@ -1140,7 +1223,7 @@ int mlt_frame_combine_audio( mlt_frame this, mlt_frame that, int16_t **buffer, m double B = exp(-2.0 * M_PI * Fc); double A = 1.0 - B; double v; - + for ( i = 0; i < *samples; i++ ) { for ( j = 0; j < *channels; j++ )