mlt_producer producer = mlt_properties_get_data( properties, "test_card_producer", NULL );
int error = 0;
- *width = *width >> 1 << 1;
-
if ( get_image != NULL )
{
+ mlt_properties_set_int( properties, "image_count", mlt_properties_get_int( properties, "image_count" ) - 1 );
mlt_position position = mlt_frame_get_position( this );
error = get_image( this, buffer, format, width, height, writable );
+ mlt_properties_set_int( properties, "width", *width );
+ mlt_properties_set_int( properties, "height", *height );
+ mlt_properties_set_int( properties, "format", *format );
mlt_frame_set_position( this, position );
}
else if ( mlt_properties_get_data( properties, "image", NULL ) != NULL )
{
- *format = mlt_image_yuv422;
+ *format = mlt_properties_get_int( properties, "format" );
*buffer = mlt_properties_get_data( properties, "image", NULL );
*width = mlt_properties_get_int( properties, "width" );
*height = mlt_properties_get_int( properties, "height" );
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_set_int( properties, "format", *format );
mlt_properties_set_double( properties, "aspect_ratio", mlt_frame_get_aspect_ratio( test_frame ) );
}
else
*height = *height == 0 ? 576 : *height;
size = *width * *height;
+ mlt_properties_set_int( properties, "format", *format );
mlt_properties_set_int( properties, "width", *width );
mlt_properties_set_int( properties, "height", *height );
- mlt_properties_set_int( properties, "aspect_ratio", 1 );
+ mlt_properties_set_int( properties, "aspect_ratio", 0 );
switch( *format )
{
memset( *buffer, 255, size );
break;
case mlt_image_rgb24a:
+ case mlt_image_opengl:
size *= 4;
size += *width * 4;
*buffer = mlt_pool_alloc( size );
if ( mlt_properties_get( properties, "meta.volume" ) )
{
double value = mlt_properties_get_double( properties, "meta.volume" );
+
if ( value == 0.0 )
{
memset( *buffer, 0, *samples * *channels * 2 );
- mlt_properties_set_double( properties, "meta.volume", 1.0 );
}
else if ( value != 1.0 )
{
*p = *p * value;
p ++;
}
- mlt_properties_set_double( properties, "meta.volume", 1.0 );
}
+
+ mlt_properties_set( properties, "meta.volume", NULL );
}
return 0;
if ( input != NULL && ( iwidth != owidth || iheight != oheight ) && ( owidth > 6 && oheight > 6 ) )
{
- iwidth = iwidth - ( iwidth % 2 );
- owidth = owidth - ( owidth % 2 );
+ uint8_t *out_line;
+ int offset_x = ( owidth - iwidth ) / 2;
+ int offset_y = ( oheight - iheight ) / 2;
+ int iused = iwidth;
output = mlt_pool_alloc( owidth * oheight );
+ memset( output, 0, owidth * oheight );
- // Coordinates (0,0 is middle of output)
- int y;
-
- // Calculate ranges
- int out_x_range = owidth / 2;
- int out_y_range = oheight / 2;
- int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
- int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
- // Output pointers
- uint8_t *out_line = output;
- uint8_t *out_ptr = out_line;
-
- // Calculate a middle and possibly invalid pointer in the input
- uint8_t *in_middle = input + iwidth * ( iheight / 2 ) + ( iwidth / 2 );
- int in_line = - in_y_range * iwidth - in_x_range;
+ offset_x -= offset_x % 2;
- int elements;
-
- // Fill whole section with black
- y = out_y_range - ( iheight / 2 );
- int blank_elements = owidth * y;
- elements = blank_elements;
- while ( elements -- )
- *out_line ++ = 0;
-
- int active_width = iwidth;
- int inactive_width = out_x_range - in_x_range;
- uint8_t *p = NULL;
- uint8_t *end = NULL;
+ out_line = output + offset_y * owidth;
+ out_line += offset_x;
// Loop for the entirety of our output height.
while ( iheight -- )
{
- // Start at the beginning of the line
- out_ptr = out_line;
-
- // Fill the outer part with black
- elements = inactive_width;
- while ( elements -- )
- *out_ptr ++ = 0;
-
// 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 ++;
-
- // Fill the outer part with black
- elements = inactive_width;
- while ( elements -- )
- *out_ptr ++ = 0;
-
+ memcpy( out_line, input, iused );
+
// Move to next input line
- in_line += iwidth;
+ input += iwidth;
// Move to next output line
out_line += owidth;
}
-
- // Fill whole section with black
- elements = blank_elements;
- while ( elements -- )
- *out_line ++ = 0;
}
return output;
// Calculate strides
int istride = iwidth * 2;
int ostride = owidth * 2;
+ int offset_x = ( owidth - iwidth );
+ int offset_y = ( oheight - iheight ) / 2;
+ uint8_t *in_line = input;
+ uint8_t *out_line;
+ int size = owidth * oheight;
+ uint8_t *p = output;
- iwidth = iwidth - ( iwidth % 2 );
- owidth = owidth - ( owidth % 2 );
- //iheight = iheight - ( iheight % 2 );
- //oheight = oheight - ( oheight % 2 );
-
// Optimisation point
if ( output == NULL || input == NULL || ( owidth <= 6 || oheight <= 6 || iwidth <= 6 || oheight <= 6 ) )
{
return;
}
- // Coordinates (0,0 is middle of output)
- int y;
-
- // Calculate ranges
- int out_x_range = owidth / 2;
- int out_y_range = oheight / 2;
- int in_x_range = iwidth / 2 < out_x_range ? iwidth / 2 : out_x_range;
- int in_y_range = iheight / 2 < out_y_range ? iheight / 2 : out_y_range;
-
- // Output pointers
- uint8_t *out_line = output;
- uint8_t *out_ptr = out_line;
-
- // Calculate a middle and possibly invalid pointer in the input
- uint8_t *in_middle = input + istride * ( iheight / 2 ) + iwidth;
- int in_line = - in_y_range * istride - in_x_range * 2;
-
- int elements;
-
- // Fill whole section with black
- y = out_y_range - ( iheight / 2 );
- int blank_elements = ostride * y / 2;
- elements = blank_elements;
- while ( elements -- )
+ while( size -- )
{
- *out_line ++ = 16;
- *out_line ++ = 128;
+ *p ++ = 16;
+ *p ++ = 128;
}
- int active_width = 2 * iwidth;
- int left_inactive_width = out_x_range - in_x_range;
- int right_inactive_width = left_inactive_width;
- uint8_t *p = NULL;
- uint8_t *end = NULL;
+ offset_x -= offset_x % 4;
- if ( in_line % 4 )
- {
- active_width -= 2;
- in_middle += 2;
- right_inactive_width += 2;
- }
+ out_line = output + offset_y * ostride;
+ out_line += offset_x;
// Loop for the entirety of our output height.
while ( iheight -- )
{
- // Start at the beginning of the line
- out_ptr = out_line;
-
- // Fill the outer part with black
- elements = left_inactive_width;
- while ( elements -- )
- {
- *out_ptr ++ = 16;
- *out_ptr ++ = 128;
- }
-
// 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 ++;
- }
+ memcpy( out_line, in_line, iwidth * 2 );
- // Fill the outer part with black
- elements = right_inactive_width;
- while ( elements -- )
- {
- *out_ptr ++ = 16;
- *out_ptr ++ = 128;
- }
+ // Move to next input line
+ in_line += istride;
- // Move to next input line
- in_line += istride;
-
- // Move to next output line
- out_line += ostride;
+ // 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
alpha = mlt_resize_alpha( alpha, owidth, oheight, iwidth, iheight );
if ( alpha != NULL )
{
- mlt_properties_set_data( properties, "alpha", alpha, owidth * ( oheight + 1 ), ( mlt_destructor )mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha, owidth * oheight, ( mlt_destructor )mlt_pool_release, NULL );
this->get_alpha_mask = NULL;
}
int i, j;
double d = 0, s = 0;
- mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
mlt_frame_get_audio( that, &src, format, &frequency_src, &channels_src, &samples_src );
+ mlt_frame_get_audio( this, &dest, format, &frequency_dest, &channels_dest, &samples_dest );
int silent = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "silent_audio" );
mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "silent_audio", 0 );
return ret;
}
+/* Will this break when mlt_position is converted to double? -Zach */
int mlt_sample_calculator( float fps, int frequency, int64_t position )
{
int samples = 0;
return samples;
}
+
+int64_t mlt_sample_calculator_to_now( float fps, int frequency, int64_t frame )
+{
+ int64_t samples = 0;
+
+ // TODO: Correct rules for NTSC and drop the * 100 hack
+ if ( ( int )( fps * 100 ) == 2997 )
+ {
+ samples = ( ( double )( frame * frequency ) / 30 );
+ switch( frequency )
+ {
+ case 48000:
+ samples += 2 * ( frame / 5 );
+ break;
+ case 44100:
+ samples += frame + ( frame / 2 ) - ( frame / 30 ) + ( frame / 300 );
+ break;
+ case 32000:
+ samples += ( 2 * frame ) - ( frame / 4 ) - ( frame / 29 );
+ break;
+ }
+ }
+ else if ( fps != 0 )
+ {
+ samples = ( ( frame * frequency ) / ( int )fps );
+ }
+
+ return samples;
+}
projects / melted / blobdiff