#include "config.h"
#include "mlt_frame.h"
+#include "mlt_producer.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
if ( this != NULL )
{
+ // Get the normalisation
+ char *normalisation = getenv( "MLT_NORMALISATION" );
+
// Initialise the properties
mlt_properties properties = &this->parent;
mlt_properties_init( properties, this );
// 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 );
+
+ // Construct stacks for frames and methods
+ this->stack_get_image = mlt_deque_init( );
+ this->stack_frame = mlt_deque_init( );
+ this->stack_service = mlt_deque_init( );
}
+
return this;
}
int mlt_frame_push_get_image( mlt_frame this, mlt_get_image get_image )
{
- int ret = this->stack_get_image_size >= 10;
- if ( ret == 0 )
- this->stack_get_image[ this->stack_get_image_size ++ ] = get_image;
- return ret;
+ return mlt_deque_push_back( this->stack_get_image, get_image );
}
/** Pop a get_image callback.
mlt_get_image mlt_frame_pop_get_image( mlt_frame this )
{
- mlt_get_image result = NULL;
- if ( this->stack_get_image_size > 0 )
- result = this->stack_get_image[ -- this->stack_get_image_size ];
- return result;
+ return mlt_deque_pop_back( this->stack_get_image );
}
/** Push a frame.
int mlt_frame_push_frame( mlt_frame this, mlt_frame that )
{
- int ret = this->stack_frame_size >= 10;
- if ( ret == 0 )
- this->stack_frame[ this->stack_frame_size ++ ] = that;
- return ret;
+ return mlt_deque_push_back( this->stack_frame, that );
}
/** Pop a frame.
mlt_frame mlt_frame_pop_frame( mlt_frame this )
{
- mlt_frame result = NULL;
- if ( this->stack_frame_size > 0 )
- result = this->stack_frame[ -- this->stack_frame_size ];
- return result;
+ return mlt_deque_pop_back( this->stack_frame );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service( mlt_frame this, void *that )
+{
+ return mlt_deque_push_back( this->stack_service, that );
+}
+
+/** Pop a service.
+*/
+
+void *mlt_frame_pop_service( mlt_frame this )
+{
+ return mlt_deque_pop_back( this->stack_service );
}
int mlt_frame_get_image( mlt_frame this, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
mlt_properties properties = mlt_frame_properties( this );
mlt_get_image get_image = mlt_frame_pop_get_image( this );
+ mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
if ( get_image != NULL )
{
*width = mlt_properties_get_int( properties, "width" );
*height = mlt_properties_get_int( properties, "height" );
}
+ else if ( producer != NULL )
+ {
+ mlt_frame test_frame = NULL;
+ 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_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 );
+ }
+ else
+ {
+ mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL );
+ mlt_frame_get_image( this, buffer, format, width, height, writable );
+ }
+ }
else
{
uint8_t *p;
break;
case mlt_image_rgb24:
size *= 3;
- *buffer = malloc( size );
+ size += *width * 3;
+ *buffer = mlt_pool_alloc( size );
if ( *buffer )
memset( *buffer, 255, size );
break;
case mlt_image_rgb24a:
size *= 4;
- *buffer = malloc( size );
+ size += *width * 4;
+ *buffer = mlt_pool_alloc( size );
if ( *buffer )
memset( *buffer, 255, size );
break;
case mlt_image_yuv422:
size *= 2;
- *buffer = malloc( size );
+ size += *width * 2;
+ *buffer = mlt_pool_alloc( size );
p = *buffer;
q = p + size;
while ( p != NULL && p != q )
break;
case mlt_image_yuv420p:
size = size * 3 / 2;
- *buffer = malloc( size );
+ *buffer = mlt_pool_alloc( size );
if ( *buffer )
memset( *buffer, 255, size );
break;
}
- mlt_properties_set_data( properties, "image", *buffer, size, free, NULL );
+ mlt_properties_set_data( properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "test_image", 1 );
}
*channels = *channels <= 0 ? 2 : *channels;
*frequency = *frequency <= 0 ? 48000 : *frequency;
size = *samples * *channels * sizeof( int16_t );
- *buffer = malloc( size );
+ *buffer = mlt_pool_alloc( size );
if ( *buffer != NULL )
memset( *buffer, 0, size );
- mlt_properties_set_data( properties, "audio", *buffer, size, free, NULL );
+ mlt_properties_set_data( properties, "audio", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "test_audio", 1 );
}
return 0;
void mlt_frame_close( mlt_frame this )
{
- mlt_properties_close( &this->parent );
- free( this );
+ if ( this != NULL )
+ {
+ mlt_deque_close( this->stack_get_image );
+ mlt_deque_close( this->stack_frame );
+ mlt_deque_close( this->stack_service );
+ mlt_properties_close( &this->parent );
+ free( this );
+ }
}
/***** convenience functions *****/
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
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 };
+ 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 ++ = 0;
+ *out_line ++ = 128;
+ }
+
+ 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 ++ = 0;
+ *out_ptr ++ = 128;
+ }
- // 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 ++ = 0;
+ *out_ptr ++ = 128;
}
+ // 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 ++ = 0;
+ *out_line ++ = 128;
+ }
}
/** A resizing function for yuv422 frames - this does not rescale, but simply
if ( iwidth != owidth || iheight != oheight )
{
// Create the output image
- uint8_t *output = malloc( owidth * oheight * 2 );
+ uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
// 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", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, 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;
}
if ( iwidth != owidth || iheight != oheight )
{
// Create the output image
- uint8_t *output = malloc( owidth * oheight * 2 );
+ uint8_t *output = mlt_pool_alloc( owidth * ( oheight + 1 ) * 2 );
// Calculate strides
int istride = iwidth * 2;
}
// Now update the frame
- mlt_properties_set_data( properties, "image", output, owidth * oheight * 2, free, NULL );
+ mlt_properties_set_data( properties, "image", output, owidth * ( oheight + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
mlt_properties_set_int( properties, "width", owidth );
mlt_properties_set_int( properties, "height", oheight );
projects / mlt / blobdiff