X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_frame.c;h=a62ed7ac59fbb9622fc14a5f413d5e4acd83b66a;hb=94dce1aea965163f8dcd2f97271f2652abb0e62d;hp=3b5c556b5521cf82a4ba372b16aa2fedf22990f8;hpb=6159bd78fa8e72c784747776a2c4c63d9c461ff5;p=melted diff --git a/src/framework/mlt_frame.c b/src/framework/mlt_frame.c index 3b5c556..a62ed7a 100644 --- a/src/framework/mlt_frame.c +++ b/src/framework/mlt_frame.c @@ -35,6 +35,9 @@ mlt_frame mlt_frame_init( ) if ( this != NULL ) { + // Get the normalisation + char *normalisation = getenv( "MLT_NORMALISATION" ); + // Initialise the properties mlt_properties properties = &this->parent; mlt_properties_init( properties, this ); @@ -42,11 +45,27 @@ 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 ); - mlt_properties_set_int( properties, "width", 720 ); - mlt_properties_set_int( properties, "height", 576 ); + + 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 ); + } + 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", 4.0 / 3.0 ); mlt_properties_set_data( properties, "audio", NULL, 0, NULL, NULL ); mlt_properties_set_data( properties, "alpha", NULL, 0, NULL, NULL ); + + } return this; } @@ -174,10 +193,13 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for mlt_service_get_frame( mlt_producer_service( producer ), &test_frame, 0 ); if ( test_frame != NULL ) { + mlt_properties test_properties = mlt_frame_properties( test_frame ); + mlt_properties_set_double( test_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) ); + mlt_properties_set_double( test_properties, "consumer_scale", mlt_properties_get_double( properties, "consumer_scale" ) ); + mlt_properties_set( test_properties, "rescale.interp", "nearest" ); mlt_frame_get_image( test_frame, buffer, format, width, height, writable ); - mlt_properties_inherit( mlt_frame_properties( this ), mlt_frame_properties( test_frame ) ); + mlt_properties_inherit( properties, test_properties ); mlt_properties_set_data( properties, "test_card_frame", test_frame, 0, ( mlt_destructor )mlt_frame_close, NULL ); - mlt_properties_set_data( properties, "image", *buffer, *width * *height * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", *width ); mlt_properties_set_int( properties, "height", *height ); @@ -190,6 +212,7 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for } else { + void *release = NULL; uint8_t *p; uint8_t *q; int size = 0; @@ -209,19 +232,22 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for break; case mlt_image_rgb24: size *= 3; - *buffer = malloc( size ); + size += *width * 3; + *buffer = mlt_pool_allocate( size, &release ); if ( *buffer ) memset( *buffer, 255, size ); break; case mlt_image_rgb24a: size *= 4; - *buffer = malloc( size ); + size += *width * 4; + *buffer = mlt_pool_allocate( size, &release ); if ( *buffer ) memset( *buffer, 255, size ); break; case mlt_image_yuv422: size *= 2; - *buffer = malloc( size ); + size += *width * 2; + *buffer = mlt_pool_allocate( size, &release ); p = *buffer; q = p + size; while ( p != NULL && p != q ) @@ -232,13 +258,14 @@ int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *for break; case mlt_image_yuv420p: size = size * 3 / 2; - *buffer = malloc( size ); - if ( *buffer ) + *buffer = mlt_pool_allocate( size, &release ); + if ( *buffer ) memset( *buffer, 255, size ); break; } - mlt_properties_set_data( properties, "image", *buffer, size, free, NULL ); + mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "image", *buffer, size, NULL, NULL ); mlt_properties_set_int( properties, "test_image", 1 ); } @@ -263,14 +290,16 @@ int mlt_frame_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *for else { int size = 0; + void *release = NULL; *samples = *samples <= 0 ? 1920 : *samples; *channels = *channels <= 0 ? 2 : *channels; *frequency = *frequency <= 0 ? 48000 : *frequency; size = *samples * *channels * sizeof( int16_t ); - *buffer = malloc( size ); + *buffer = mlt_pool_allocate( size, &release ); if ( *buffer != NULL ) memset( *buffer, 0, size ); - mlt_properties_set_data( properties, "audio", *buffer, size, free, NULL ); + mlt_properties_set_data( properties, "audio_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "audio", *buffer, size, NULL, NULL ); mlt_properties_set_int( properties, "test_audio", 1 ); } return 0; @@ -404,29 +433,6 @@ int mlt_convert_yuv420p_to_yuv422( uint8_t *yuv420p, int width, int height, int return ret; } -void *memfill( void *dst, void *src, int l, int elements ) -{ - int i = 0; - if ( l == 2 ) - { - uint8_t *p = dst; - uint8_t *src1 = src; - uint8_t *src2 = src + 1; - for ( i = 0; i < elements; i ++ ) - { - *p ++ = *src1; - *p ++ = *src2; - } - dst = p; - } - else - { - for ( i = 0; i < elements; i ++ ) - dst = memcpy( dst, src, l ) + l; - } - return dst; -} - void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input, int iwidth, int iheight ) { // Calculate strides @@ -459,38 +465,62 @@ void mlt_resize_yuv422( uint8_t *output, int owidth, int oheight, uint8_t *input uint8_t *in_middle = input + istride * ( iheight / 2 ) + ( iwidth / 2 ) * 2; int in_line = - in_y_range * istride - in_x_range * 2; - uint8_t black[ 2 ] = { 16, 128 }; + uint8_t black[ 2 ] = { 0, 128 }; + int elements; + + // Fill whole section with black + y = out_y_range - ( iheight / 2 ); + int blank_elements = ostride * y / 2; + elements = blank_elements; + while ( elements -- ) + { + *out_line ++ = black[ 0 ]; + *out_line ++ = black[ 1 ]; + } + + int active_width = 2 * iwidth; + int inactive_width = out_x_range - in_x_range; // Loop for the entirety of our output height. - for ( y = - out_y_range; y < out_y_range ; y ++ ) + while ( iheight -- ) { // Start at the beginning of the line out_ptr = out_line; - if ( abs( y ) < iheight / 2 ) + // Fill the outer part with black + elements = inactive_width; + while ( elements -- ) { - // Fill the outer part with black - out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range ); - - // We're in the input range for this row. - memcpy( out_ptr, in_middle + in_line, 2 * iwidth ); - out_ptr += 2 * iwidth; + *out_ptr ++ = black[ 0 ]; + *out_ptr ++ = black[ 1 ]; + } - // Fill the outer part with black - out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range ); + // We're in the input range for this row. + memcpy( out_ptr, in_middle + in_line, active_width ); + out_ptr += active_width; - // Move to next input line - in_line += istride; - } - else + // Fill the outer part with black + elements = inactive_width; + while ( elements -- ) { - // Fill whole line with black - out_ptr = memfill( out_ptr, black, 2, owidth ); + *out_ptr ++ = black[ 0 ]; + *out_ptr ++ = black[ 1 ]; } + // Move to next input line + in_line += istride; + // Move to next output line out_line += ostride; } + + // Fill whole section with black + elements = blank_elements; + while ( elements -- ) + { + *out_line ++ = black[ 0 ]; + *out_line ++ = black[ 1 ]; + } } /** A resizing function for yuv422 frames - this does not rescale, but simply @@ -511,21 +541,21 @@ uint8_t *mlt_frame_resize_yuv422( mlt_frame this, int owidth, int oheight ) if ( iwidth != owidth || iheight != oheight ) { // Create the output image - uint8_t *output = malloc( owidth * oheight * 2 ); + void *release = NULL; + uint8_t *output = mlt_pool_allocate( owidth * ( oheight + 1 ) * 2, &release ); // Call the generic resize mlt_resize_yuv422( output, owidth, oheight, input, iwidth, iheight ); // Now update the frame - mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); + mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", owidth ); mlt_properties_set_int( properties, "height", oheight ); - mlt_frame_set_aspect_ratio( this, 4.0/3.0/*( float )owidth / oheight*/ ); // Return the output return output; } - // No change, return input return input; } @@ -548,7 +578,8 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) if ( iwidth != owidth || iheight != oheight ) { // Create the output image - uint8_t *output = malloc( owidth * oheight * 2 ); + void *release = NULL; + uint8_t *output = mlt_pool_allocate( owidth * ( oheight + 1 ) * 2, &release ); // Calculate strides int istride = iwidth * 2; @@ -611,7 +642,8 @@ uint8_t *mlt_frame_rescale_yuv422( mlt_frame this, int owidth, int oheight ) } // Now update the frame - mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL ); + mlt_properties_set_data( properties, "image_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL ); + mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, NULL, NULL ); mlt_properties_set_int( properties, "width", owidth ); mlt_properties_set_int( properties, "height", oheight );