mlt_properties_init( properties, this );
// Set default properties on the frame
- mlt_properties_set_timecode( properties, "timecode", 0.0 );
+ 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 );
int mlt_frame_is_test_card( mlt_frame this )
{
- return this->stack_get_image_size == 0;
+ return ( this->stack_get_image_size == 0 && mlt_properties_get_data( mlt_frame_properties( this ), "image", NULL ) == NULL );
+}
+
+/** Check if we have a way to derive something than test audio.
+*/
+
+int mlt_frame_is_test_audio( mlt_frame this )
+{
+ return this->get_audio == NULL;
}
/** Get the aspect ratio of the frame.
double mlt_frame_get_aspect_ratio( mlt_frame this )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_get_double( properties, "aspect_ratio" );
+ return mlt_properties_get_double( mlt_frame_properties( this ), "aspect_ratio" );
}
/** Set the aspect ratio of the frame.
int mlt_frame_set_aspect_ratio( mlt_frame this, double value )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_set_double( properties, "aspect_ratio", value );
+ return mlt_properties_set_double( mlt_frame_properties( this ), "aspect_ratio", value );
}
-/** Get the timecode of this frame.
+/** Get the position of this frame.
*/
-mlt_timecode mlt_frame_get_timecode( mlt_frame this )
+mlt_position mlt_frame_get_position( mlt_frame this )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_get_timecode( properties, "timecode" );
+ return mlt_properties_get_position( mlt_frame_properties( this ), "position" );
}
-/** Set the timecode of this frame.
+/** Set the position of this frame.
*/
-int mlt_frame_set_timecode( mlt_frame this, mlt_timecode value )
+int mlt_frame_set_position( mlt_frame this, mlt_position value )
{
- mlt_properties properties = mlt_frame_properties( this );
- return mlt_properties_set_timecode( properties, "timecode", value );
+ return mlt_properties_set_position( mlt_frame_properties( this ), "position", value );
}
/** Stack a get_image callback.
void mlt_frame_close( mlt_frame this )
{
- mlt_frame frame = mlt_frame_pop_frame( this );
-
- while ( frame != NULL )
- {
- mlt_frame_close( frame);
- frame = mlt_frame_pop_frame( this );
- }
-
mlt_properties_close( &this->parent );
-
free( this );
}
if ( p_alpha )
p_alpha += x_src + y_src * stride_src / 2;
+ uint8_t *p = p_src;
+ uint8_t *q = p_dest;
+ uint8_t *o = p_dest;
+ uint8_t *z = p_alpha;
+
+ uint8_t Y;
+ uint8_t UV;
+ uint8_t a;
+ float value;
+
// now do the compositing only to cropped extents
for ( i = 0; i < height_src; i++ )
{
- uint8_t *p = p_src;
- uint8_t *q = p_dest;
- uint8_t *o = p_dest;
- uint8_t *z = p_alpha;
+ p = p_src;
+ q = p_dest;
+ o = p_dest;
+ z = p_alpha;
for ( j = 0; j < width_src; j ++ )
{
- uint8_t y = *p ++;
- uint8_t uv = *p ++;
- uint8_t a = ( z == NULL ) ? 255 : *z ++;
- float value = ( weight * ( float ) a / 255.0 );
- *o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
- *o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
+ Y = *p ++;
+ UV = *p ++;
+ a = ( z == NULL ) ? 255 : *z ++;
+ value = ( weight * ( float ) a / 255.0 );
+ *o ++ = (uint8_t)( Y * value + *q++ * ( 1 - value ) );
+ *o ++ = (uint8_t)( UV * value + *q++ * ( 1 - value ) );
}
p_src += stride_src;
void *memfill( void *dst, void *src, int l, int elements )
{
int i = 0;
- for ( i = 0; i < elements; i ++ )
- dst = memcpy( dst, src, l ) + l;
+ 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;
}
uint8_t *in_ptr;
// Generate the affine transform scaling values
- float scale_width = ( float )iwidth / ( float )owidth;
- float scale_height = ( float )iheight / ( float )oheight;
+ int scale_width = ( iwidth << 16 ) / owidth;
+ int scale_height = ( iheight << 16 ) / oheight;
// Loop for the entirety of our output height.
for ( y = - out_y_range; y < out_y_range ; y ++ )
{
// Calculate the derived y value
- dy = scale_height * y;
+ dy = ( scale_height * y ) >> 16;
// Start at the beginning of the line
out_ptr = out_line;
for ( x = - out_x_range; x < out_x_range; x += 1 )
{
// Calculated the derived x
- dx = scale_width * x;
-
- // Check if x and y are in the valid input range.
- if ( abs( dx ) < in_x_range && abs( dy ) < in_y_range )
- {
- // We're in the input range for this row.
- in_ptr = in_line + ( dx >> 1 ) * 4 + 2 * ( x & 1 );
- *out_ptr ++ = *in_ptr ++;
- *out_ptr ++ = *in_ptr ++;
- }
- else
- {
- // We're not in the input range for this row.
- *out_ptr ++ = 16;
- *out_ptr ++ = 128;
- }
+ 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;
}
// Move to next output line
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 = 0, frequency_dest = 0;
- int channels_src = 0, channels_dest = 0;
- int samples_src = 0, samples_dest = 0;
+ int frequency_src = *channels, frequency_dest = *channels;
+ 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 );
- //fprintf( stderr, "frame dest samples %d channels %d timecode %f\n", samples_dest, channels_dest, mlt_properties_get_timecode( mlt_frame_properties( this ), "timecode" ) );
+ //fprintf( stderr, "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 );
//fprintf( stderr, "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 )
}
else
src = p_src;
-#else
- src = p_src;
- dest = p_dest;
#endif
// determine number of samples to process
{
for ( j = 0; j < *channels; j++ )
{
- double d = (double) dest[ i * channels_dest + j ];
- double s = (double) src[ i * channels_src + j ];
+ if ( j < channels_dest )
+ d = (double) dest[ i * channels_dest + j ];
+ if ( j < channels_src )
+ s = (double) src[ i * channels_src + j ];
dest[ i * channels_dest + j ] = s * weight + d * ( 1.0 - weight );
}
}
projects / melted / blobdiff