char *filename;
int width;
int height;
- double *bitmap;
+ float *bitmap;
}
transition_luma;
// image processing functions
-static inline double smoothstep( double edge1, double edge2, double a )
+static inline float smoothstep( float edge1, float edge2, float a )
{
if ( a < edge1 )
return 0.0;
return ( a * a * ( 3 - 2 * a ) );
}
+/** Calculate the position for this frame.
+*/
+
+static float position_calculate( mlt_transition this, mlt_frame frame )
+{
+ // Get the in and out position
+ mlt_position in = mlt_transition_get_in( this );
+ mlt_position out = mlt_transition_get_out( this );
+
+ // Get the position of the frame
+ mlt_position position = mlt_frame_get_position( frame );
+
+ // Now do the calcs
+ return ( float )( position - in ) / ( float )( out - in + 1 );
+}
+
+/** Calculate the field delta for this frame - position between two frames.
+*/
+
+static float delta_calculate( mlt_transition this, mlt_frame frame )
+{
+ // Get the in and out position
+ mlt_position in = mlt_transition_get_in( this );
+ mlt_position out = mlt_transition_get_out( this );
+
+ // Get the position of the frame
+ mlt_position position = mlt_frame_get_position( frame );
+
+ // Now do the calcs
+ float x = ( float )( position - in ) / ( float )( out - in + 1 );
+ position++;
+ float y = ( float )( position - in ) / ( float )( out - in + 1 );
+
+ return ( y - x ) / 2.0;
+}
+
+static inline int dissolve_yuv( mlt_frame this, mlt_frame that, float weight, int width, int height )
+{
+ int ret = 0;
+ int width_src = width, height_src = height;
+ mlt_image_format format = mlt_image_yuv422;
+ uint8_t *p_src, *p_dest;
+ float weight_complement = 1 - weight;
+ uint8_t *p;
+ uint8_t *limit;
+
+ mlt_frame_get_image( this, &p_dest, &format, &width, &height, 1 /* writable */ );
+ mlt_frame_get_image( that, &p_src, &format, &width_src, &height_src, 0 /* writable */ );
+
+ p = p_dest;
+ limit = p_dest + height_src * width_src * 2;
+
+ while ( p < limit )
+ *p_dest++ = ( uint8_t )( *p_src++ * weight + *p++ * weight_complement );
+
+ return ret;
+}
+
/** powerful stuff
\param field_order -1 = progressive, 0 = lower field first, 1 = top field first
*/
-static void luma_composite( mlt_frame this, mlt_frame b_frame, int luma_width, int luma_height,
- double *luma_bitmap, double pos, double frame_delta, double softness, int field_order )
+static void luma_composite( mlt_frame a_frame, mlt_frame b_frame, int luma_width, int luma_height,
+ float *luma_bitmap, float pos, float frame_delta, float softness, int field_order,
+ int *width, int *height )
{
- int width_src, height_src;
- int width_dest, height_dest;
- mlt_image_format format_src, format_dest;
+ int width_src = *width, height_src = *height;
+ int width_dest = *width, height_dest = *height;
+ mlt_image_format format_src = mlt_image_yuv422, format_dest = mlt_image_yuv422;
uint8_t *p_src, *p_dest;
int i, j;
int stride_src;
int stride_dest;
- double weight = 0;
+ float weight = 0;
int field;
format_src = mlt_image_yuv422;
format_dest = mlt_image_yuv422;
- mlt_frame_get_image( this, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
+ mlt_frame_get_image( a_frame, &p_dest, &format_dest, &width_dest, &height_dest, 1 /* writable */ );
mlt_frame_get_image( b_frame, &p_src, &format_src, &width_src, &height_src, 0 /* writable */ );
stride_src = width_src * 2;
stride_dest = width_dest * 2;
+ // Offset the position based on which field we're looking at ...
+ float field_pos[ 2 ];
+ field_pos[ 0 ] = pos + ( ( field_order == 0 ? 1 : 0 ) * frame_delta * 0.5 );
+ field_pos[ 1 ] = pos + ( ( field_order == 0 ? 0 : 1 ) * frame_delta * 0.5 );
+
+ // adjust the position for the softness level
+ field_pos[ 0 ] *= ( 1.0 + softness );
+ field_pos[ 1 ] *= ( 1.0 + softness );
+
+ uint8_t *p;
+ uint8_t *q;
+ uint8_t *o;
+ float *l;
+
+ uint8_t y;
+ uint8_t uv;
+ float value;
+
+ float x_diff = ( float )luma_width / ( float )*width;
+ float y_diff = ( float )luma_height / ( float )*height;
+
// composite using luma map
for ( field = 0; field < ( field_order < 0 ? 1 : 2 ); ++field )
{
- // Offset the position based on which field we're looking at ...
- double field_pos = pos + ( ( field_order == 0 ? 1 - field : field) * frame_delta * 0.5 );
-
- // adjust the position for the softness level
- field_pos *= ( 1.0 + softness );
-
for ( i = field; i < height_src; i += ( field_order < 0 ? 1 : 2 ) )
{
- uint8_t *p = &p_src[ i * stride_src ];
- uint8_t *q = &p_dest[ i * stride_dest ];
- uint8_t *o = &p_dest[ i * stride_dest ];
- double *l = &luma_bitmap[ i * luma_width ];
+ p = &p_src[ i * stride_src ];
+ q = &p_dest[ i * stride_dest ];
+ o = &p_dest[ i * stride_dest ];
+ l = &luma_bitmap[ ( int )( ( float )i * y_diff ) * luma_width ];
for ( j = 0; j < width_src; j ++ )
{
- uint8_t y = *p ++;
- uint8_t uv = *p ++;
- weight = *l ++;
- double value = smoothstep( weight, weight + softness, field_pos );
+ y = *p ++;
+ uv = *p ++;
+ weight = l[ ( int )( ( float )j * x_diff ) ];
+ value = smoothstep( weight, weight + softness, field_pos[ field ] );
*o ++ = (uint8_t)( y * value + *q++ * ( 1 - value ) );
*o ++ = (uint8_t)( uv * value + *q++ * ( 1 - value ) );
mlt_properties b_props = mlt_frame_properties( b_frame );
// Arbitrary composite defaults
- static double previous_mix = 0;
- double mix = 0;
- int luma_width = 0;
- int luma_height = 0;
- double *luma_bitmap = NULL;
- double luma_softness = 0;
- int progressive = 0;
- int top_field_first = 0;
-
- // mix is the offset time value in the duration of the transition
- // - also used as the mixing level for a dissolve
- if ( mlt_properties_get( b_props, "mix" ) != NULL )
- mix = mlt_properties_get_double( b_props, "mix" );
-
- // (mix - previous_mix) is the animation delta, if backwards reset previous
- if ( mix < previous_mix )
- previous_mix = 0;
-
- // Get the interlace and field properties of the frame
- if ( mlt_properties_get( b_props, "progressive" ) != NULL )
- progressive = mlt_properties_get_int( b_props, "progressive" );
- if ( mlt_properties_get( b_props, "top_field_first" ) != NULL )
- top_field_first = mlt_properties_get_int( b_props, "top_field_first" );
-
- // Get the luma map parameters
- if ( mlt_properties_get( b_props, "luma.width" ) != NULL )
- luma_width = mlt_properties_get_int( b_props, "luma.width" );
- if ( mlt_properties_get( b_props, "luma.height" ) != NULL )
- luma_height = mlt_properties_get_int( b_props, "luma.height" );
- if ( mlt_properties_get( b_props, "luma.softness" ) != NULL )
- luma_softness = mlt_properties_get_double( b_props, "luma.softness" );
- luma_bitmap = (double*) mlt_properties_get_data( b_props, "luma.bitmap", NULL );
+ float mix = mlt_properties_get_double( b_props, "image.mix" );
+ float frame_delta = mlt_properties_get_double( b_props, "luma.delta" );
+ int luma_width = mlt_properties_get_int( b_props, "luma.width" );
+ int luma_height = mlt_properties_get_int( b_props, "luma.height" );
+ float *luma_bitmap = mlt_properties_get_data( b_props, "luma.bitmap", NULL );
+ float luma_softness = mlt_properties_get_double( b_props, "luma.softness" );
+ int progressive = mlt_properties_get_int( b_props, "progressive" ) ||
+ mlt_properties_get_int( a_props, "consumer_progressive" ) ||
+ mlt_properties_get_int( b_props, "luma.progressive" );
+
+ int top_field_first = mlt_properties_get_int( b_props, "top_field_first" );
+ int reverse = mlt_properties_get_int( b_props, "luma.reverse" );
+
+ // Since we are the consumer of the b_frame, we must pass along this
+ // consumer property from the a_frame
+ mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+ mlt_properties_set_double( b_props, "consumer_scale", mlt_properties_get_double( a_props, "consumer_scale" ) );
+
+ // Honour the reverse here
+ mix = reverse ? 1 - mix : mix;
+ frame_delta *= reverse ? -1.0 : 1.0;
+
+ // Ensure we get scaling on the b_frame
+ mlt_properties_set( b_props, "rescale.interp", "nearest" );
if ( luma_width > 0 && luma_height > 0 && luma_bitmap != NULL )
// Composite the frames using a luma map
- luma_composite( this, b_frame, luma_width, luma_height, luma_bitmap, mix, mix - previous_mix,
- luma_softness, progressive > 0 ? -1 : top_field_first );
+ luma_composite( this, b_frame, luma_width, luma_height, luma_bitmap, mix, frame_delta,
+ luma_softness, progressive ? -1 : top_field_first, width, height );
else
// Dissolve the frames using the time offset for mix value
- mlt_frame_composite_yuv( this, b_frame, 0, 0, mix );
+ dissolve_yuv( this, b_frame, mix, *width, *height );
// Extract the a_frame image info
*width = mlt_properties_get_int( a_props, "width" );
*height = mlt_properties_get_int( a_props, "height" );
*image = mlt_properties_get_data( a_props, "image", NULL );
- // Close the b_frame
- mlt_frame_close( b_frame );
-
- previous_mix = mix;
-
return 0;
}
-static int transition_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
-{
- // Get the properties of the a frame
- mlt_properties a_props = mlt_frame_properties( frame );
-
- // Get the b frame from the stack
- mlt_frame b_frame = mlt_frame_pop_frame( frame );
-
- // Get the properties of the b frame
- mlt_properties b_props = mlt_frame_properties( b_frame );
-
- // Restore the original get_audio
- frame->get_audio = mlt_properties_get_data( a_props, "get_audio", NULL );
-
- double mix = 0;
- if ( mlt_properties_get( b_props, "mix" ) != NULL )
- mix = mlt_properties_get_double( b_props, "mix" );
- mlt_frame_mix_audio( frame, b_frame, mix, buffer, format, frequency, channels, samples );
-
- // Push the b_frame back on for get_image
- mlt_frame_push_frame( frame, b_frame );
-
- return 0;
-}
-
-
/** Load the luma map from PGM stream.
*/
-static void luma_read_pgm( FILE *f, double **map, int *width, int *height )
+static void luma_read_pgm( FILE *f, float **map, int *width, int *height )
{
uint8_t *data = NULL;
while (1)
int i = 2;
int maxval;
int bpp;
- double *p;
+ float *p;
line[127] = '\0';
// determine if this is one or two bytes per pixel
bpp = maxval > 255 ? 2 : 1;
- // allocate temporary storage for the raw data
- data = malloc( *width * *height * bpp );
+
+ // allocate temporary storage for the raw data
+ data = mlt_pool_alloc( *width * *height * bpp );
if ( data == NULL )
break;
break;
// allocate the luma bitmap
- *map = p = (double*) malloc( *width * *height * sizeof( double ) );
+ *map = p = (float*)mlt_pool_alloc( *width * *height * sizeof( float ) );
if ( *map == NULL )
break;
for ( i = 0; i < *width * *height * bpp; i += bpp )
{
if ( bpp == 1 )
- *p++ = (double) data[ i ] / (double) maxval;
+ *p++ = (float) data[ i ] / (float) maxval;
else
- *p++ = (double) ( ( data[ i ] << 8 ) + data[ i+1 ] ) / (double) maxval;
+ *p++ = (float) ( ( data[ i ] << 8 ) + data[ i+1 ] ) / (float) maxval;
}
break;
}
if ( data != NULL )
- free( data );
+ mlt_pool_release( data );
}
mlt_properties b_props = mlt_frame_properties( b_frame );
// If the filename property changed, reload the map
- char *luma_file = mlt_properties_get( properties, "filename" );
- if ( luma_file != NULL && luma_file != this->filename )
+ char *luma_file = mlt_properties_get( properties, "resource" );
+ if ( luma_file != NULL && ( this->filename == NULL || ( this->filename && strcmp( luma_file, this->filename ) ) ) )
{
- int width = mlt_properties_get_int( b_props, "width" );
- int height = mlt_properties_get_int( b_props, "height" );
- char command[ 512 ];
FILE *pipe;
- command[ 511 ] = '\0';
- this->filename = luma_file;
- snprintf( command, 511, "anytopnm %s | pnmscale -width %d -height %d", luma_file, width, height );
- //pipe = popen( command, "r" );
+ free( this->filename );
+ this->filename = strdup( luma_file );
pipe = fopen( luma_file, "r" );
if ( pipe != NULL )
{
+ mlt_pool_release( this->bitmap );
luma_read_pgm( pipe, &this->bitmap, &this->width, &this->height );
- //pclose( pipe );
fclose( pipe );
}
-
}
- // Determine the time position of this frame in the transition duration
- mlt_timecode in = mlt_transition_get_in( transition );
- mlt_timecode out = mlt_transition_get_out( transition );
- mlt_timecode time = mlt_frame_get_timecode( b_frame );
- double pos = ( time - in ) / ( out - in );
-
// Set the b frame properties
- mlt_properties_set_double( b_props, "mix", pos );
+ mlt_properties_set_double( b_props, "image.mix", position_calculate( transition, b_frame ) );
+ mlt_properties_set_double( b_props, "luma.delta", delta_calculate( transition, b_frame ) );
mlt_properties_set_int( b_props, "luma.width", this->width );
mlt_properties_set_int( b_props, "luma.height", this->height );
mlt_properties_set_data( b_props, "luma.bitmap", this->bitmap, 0, NULL, NULL );
- if ( mlt_properties_get( properties, "softness" ) != NULL )
- mlt_properties_set_double( b_props, "luma.softness", mlt_properties_get_double( properties, "softness" ) );
+ mlt_properties_set_int( b_props, "luma.reverse", mlt_properties_get_int( properties, "reverse" ) );
+ mlt_properties_set_double( b_props, "luma.softness", mlt_properties_get_double( properties, "softness" ) );
mlt_frame_push_get_image( a_frame, transition_get_image );
mlt_frame_push_frame( a_frame, b_frame );
-/************************ AUDIO ***************************/
- // Backup the original get_audio (it's still needed)
- mlt_properties_set_data( mlt_frame_properties( a_frame ), "get_audio", a_frame->get_audio, 0, NULL, NULL );
-
- // Override the get_audio method
- a_frame->get_audio = transition_get_audio;
-
return a_frame;
}
mlt_transition_init( transition, this );
transition->process = transition_process;
transition->close = transition_close;
-
- if ( lumafile != NULL )
- mlt_properties_set( mlt_transition_properties( transition ), "filename", lumafile );
-
+ mlt_properties_set( mlt_transition_properties( transition ), "resource", lumafile );
return &this->parent;
}
return NULL;
static void transition_close( mlt_transition parent )
{
transition_luma *this = (transition_luma*) parent->child;
-
- if ( this->bitmap )
- free( this->bitmap );
-
- parent->close = NULL;
- mlt_transition_close( parent );
+ mlt_pool_release( this->bitmap );
+ free( this->filename );
free( this );
}
projects / melted / blobdiff