#include "config.h"
#include "mlt_frame.h"
+#include "mlt_producer.h"
+#include "mlt_factory.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
if ( this != NULL )
{
+ // Get the normalisation
+ char *normalisation = mlt_environment( "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 );
- mlt_properties_set_double( properties, "aspect_ratio", 4.0 / 3.0 );
+
+ 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", 72.0/79.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", 128.0/117.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_image = mlt_deque_init( );
+ this->stack_audio = mlt_deque_init( );
}
+
return this;
}
int mlt_frame_is_test_card( mlt_frame this )
{
- return mlt_properties_get_int( mlt_frame_properties( this ), "test_image" );
+ return mlt_deque_count( this->stack_image ) == 0 || mlt_properties_get_int( mlt_frame_properties( this ), "test_image" );
}
/** Check if we have a way to derive something than test audio.
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_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_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_image, 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_image );
+}
+
+/** Push a service.
+*/
+
+int mlt_frame_push_service( mlt_frame this, void *that )
+{
+ return mlt_deque_push_back( this->stack_image, that );
+}
+
+/** Pop a service.
+*/
+
+void *mlt_frame_pop_service( mlt_frame this )
+{
+ return mlt_deque_pop_back( this->stack_image );
+}
+
+/** Push an audio item on the stack.
+*/
+
+int mlt_frame_push_audio( mlt_frame this, void *that )
+{
+ return mlt_deque_push_back( this->stack_audio, that );
+}
+
+/** Pop an audio item from the stack
+*/
+
+void *mlt_frame_pop_audio( mlt_frame this )
+{
+ return mlt_deque_pop_back( this->stack_audio );
}
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_pass( test_properties, properties, "" );
+ mlt_properties_set( test_properties, "rescale.interp", "nearest" );
+ //mlt_properties_set( test_properties, "aspect_ratio", "1" );
+ //mlt_properties_set( test_properties, "consumer_aspect_ratio", "1" );
+ 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 );
+ //mlt_properties_pass( properties, test_properties, "" );
+ mlt_properties_set( properties, "rescale.interp", "none" );
+ mlt_properties_set( properties, "scale", "off" );
+ }
+ 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;
mlt_properties_set_int( properties, "width", *width );
mlt_properties_set_int( properties, "height", *height );
+ mlt_properties_set_int( properties, "aspect_ratio", 1 );
switch( *format )
{
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 )
{
- *p ++ = 255;
+ *p ++ = 235;
*p ++ = 128;
}
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_image );
+ mlt_deque_close( this->stack_audio );
+ mlt_properties_close( &this->parent );
+ free( this );
+ }
}
/***** convenience functions *****/
-#define RGB2YUV(r, g, b, y, u, v)\
- y = (306*r + 601*g + 117*b) >> 10;\
- u = ((-172*r - 340*g + 512*b) >> 10) + 128;\
- v = ((512*r - 429*g - 83*b) >> 10) + 128;\
- y = y < 0 ? 0 : y;\
- u = u < 0 ? 0 : u;\
- v = v < 0 ? 0 : v;\
- y = y > 255 ? 255 : y;\
- u = u > 255 ? 255 : u;\
- v = v > 255 ? 255 : v
int mlt_convert_rgb24a_to_yuv422( uint8_t *rgba, int width, int height, int stride, uint8_t *yuv, uint8_t *alpha )
{
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
iheight = iheight - ( iheight % 2 );
oheight = oheight - ( oheight % 2 );
+ // Optimisation point
+ if ( iwidth == owidth && iheight == oheight )
+ memcpy( output, input, iheight * istride );
+
// Coordinates (0,0 is middle of output)
int y;
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 ++ = 16;
+ *out_line ++ = 128;
+ }
+
+ int active_width = 2 * iwidth;
+ int inactive_width = out_x_range - in_x_range;
+ uint8_t *p = NULL;
+ uint8_t *end = NULL;
// 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;
-
- // Fill the outer part with black
- out_ptr = memfill( out_ptr, black, 2, out_x_range - in_x_range );
+ *out_ptr ++ = 16;
+ *out_ptr ++ = 128;
+ }
- // Move to next input line
- in_line += istride;
+ // We're in the input range for this row.
+ p = in_middle + in_line;
+ end = out_ptr + active_width;
+ while ( out_ptr != end )
+ {
+ *out_ptr ++ = *p ++;
+ *out_ptr ++ = *p ++;
}
- 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 ++ = 16;
+ *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 ++ = 16;
+ *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;
iwidth = iwidth - ( iwidth % 4 );
- // Coordinates (0,0 is middle of output)
- int y, x;
-
// Derived coordinates
int dy, dx;
int in_y_range = iheight / 2;
// Output pointers
- uint8_t *out_line = output;
- uint8_t *out_ptr;
+ register uint8_t *out_line = output;
+ register uint8_t *out_ptr;
// Calculate a middle pointer
uint8_t *in_middle = input + istride * in_y_range + in_x_range * 2;
uint8_t *in_line;
- uint8_t *in_ptr;
// Generate the affine transform scaling values
- int scale_width = ( iwidth << 16 ) / owidth;
- int scale_height = ( iheight << 16 ) / oheight;
+ register int scale_width = ( iwidth << 16 ) / owidth;
+ register int scale_height = ( iheight << 16 ) / oheight;
+ register int base = 0;
+
+ int outer = out_x_range * scale_width;
+ int bottom = out_y_range * scale_height;
// Loop for the entirety of our output height.
- for ( y = - out_y_range; y < out_y_range ; y ++ )
+ for ( dy = - bottom; dy < bottom; dy += scale_height )
{
- // Calculate the derived y value
- dy = ( scale_height * y ) >> 16;
-
// Start at the beginning of the line
out_ptr = out_line;
// Pointer to the middle of the input line
- in_line = in_middle + dy * istride;
-
+ in_line = in_middle + ( dy >> 16 ) * istride;
+
// Loop for the entirety of our output row.
- for ( x = - out_x_range; x < out_x_range; x += 1 )
+ for ( dx = - outer; dx < outer; dx += scale_width )
{
- // Calculated the derived x
- dx = ( scale_width * x ) >> 16;
-
- // We're in the input range for this row.
- in_ptr = in_line + ( dx << 1 );
- *out_ptr ++ = *in_ptr ++;
- in_ptr = in_line + ( ( dx >> 1 ) << 2 ) + ( ( x & 1 ) << 1 ) + 1;
- *out_ptr ++ = *in_ptr;
+ base = dx >> 15;
+ base &= 0xfffffffe;
+ *out_ptr ++ = *( in_line + base );
+ base &= 0xfffffffc;
+ *out_ptr ++ = *( in_line + base + 1 );
+ dx += scale_width;
+ base = dx >> 15;
+ base &= 0xfffffffe;
+ *out_ptr ++ = *( in_line + base );
+ base &= 0xfffffffc;
+ *out_ptr ++ = *( in_line + base + 3 );
}
// Move to next output line
}
// 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 );
return input;
}
-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 )
+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 )
{
int ret = 0;
- int16_t *p_src, *p_dest;
int16_t *src, *dest;
- //static int16_t *extra_src = NULL, *extra_dest = NULL;
- static int extra_src_samples = 0, extra_dest_samples = 0;
int frequency_src = *frequency, frequency_dest = *frequency;
int channels_src = *channels, channels_dest = *channels;
int samples_src = *samples, samples_dest = *samples;
int i, j;
double d = 0, s = 0;
- mlt_frame_get_audio( this, &p_dest, format, &frequency_dest, &channels_dest, &samples_dest );
+ mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
//fprintf( stderr, "mix: frame dest samples %d channels %d position %lld\n", samples_dest, channels_dest, mlt_properties_get_position( mlt_frame_properties( this ), "_position" ) );
- mlt_frame_get_audio( that, &p_src, format, &frequency_src, &channels_src, &samples_src );
+ mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
//fprintf( stderr, "mix: frame src samples %d channels %d\n", samples_src, channels_src );
- src = p_src;
- dest = p_dest;
+
if ( channels_src > 6 )
channels_src = 0;
if ( channels_dest > 6 )
if ( samples_dest > 4000 )
samples_dest = 0;
-#if 0
- // Append new samples to leftovers
- if ( extra_dest_samples > 0 )
- {
- fprintf( stderr, "prepending %d samples to dest\n", extra_dest_samples );
- dest = realloc( extra_dest, ( samples_dest + extra_dest_samples ) * 2 * channels_dest );
- memcpy( &extra_dest[ extra_dest_samples * channels_dest ], p_dest, samples_dest * 2 * channels_dest );
- }
- else
- dest = p_dest;
- if ( extra_src_samples > 0 )
- {
- fprintf( stderr, "prepending %d samples to src\n", extra_src_samples );
- src = realloc( extra_src, ( samples_src + extra_src_samples ) * 2 * channels_src );
- memcpy( &extra_src[ extra_src_samples * channels_src ], p_src, samples_src * 2 * channels_src );
- }
- else
- src = p_src;
-#endif
-
- // determine number of samples to process
- if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
- *samples = samples_src + extra_src_samples;
- else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
- *samples = samples_dest + extra_dest_samples;
-
+ // determine number of samples to process
+ *samples = samples_src < samples_dest ? samples_src : samples_dest;
*channels = channels_src < channels_dest ? channels_src : channels_dest;
- *buffer = p_dest;
+ *buffer = dest;
*frequency = frequency_dest;
+ // Compute a smooth ramp over start to end
+ float weight = weight_start;
+ float weight_step = ( weight_end - weight_start ) / *samples;
+
// Mixdown
for ( i = 0; i < *samples; i++ )
{
s = (double) src[ i * channels_src + j ];
dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
}
+ weight += weight_step;
}
- // We have to copy --sigh
- if ( dest != p_dest )
- memcpy( p_dest, dest, *samples * 2 * *channels );
-
-#if 0
- // Store the leftovers
- if ( samples_src + extra_src_samples < samples_dest + extra_dest_samples )
- {
- extra_dest_samples = ( samples_dest + extra_dest_samples ) - ( samples_src + extra_src_samples );
- size_t size = extra_dest_samples * 2 * channels_dest;
- fprintf( stderr, "storing %d samples from dest\n", extra_dest_samples );
- if ( extra_dest )
- free( extra_dest );
- extra_dest = malloc( size );
- if ( extra_dest )
- memcpy( extra_dest, &p_dest[ ( samples_dest - extra_dest_samples - 1 ) * channels_dest ], size );
- else
- extra_dest_samples = 0;
- }
- else if ( samples_dest + extra_dest_samples < samples_src + extra_src_samples )
- {
- extra_src_samples = ( samples_src + extra_src_samples ) - ( samples_dest + extra_dest_samples );
- size_t size = extra_src_samples * 2 * channels_src;
- fprintf( stderr, "storing %d samples from src\n", extra_dest_samples );
- if ( extra_src )
- free( extra_src );
- extra_src = malloc( size );
- if ( extra_src )
- memcpy( extra_src, &p_src[ ( samples_src - extra_src_samples - 1 ) * channels_src ], size );
- else
- extra_src_samples = 0;
- }
-#endif
-
return ret;
}
return samples;
}
-
projects / melted / blobdiff