#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
/** Forward references to static methods.
*/
mlt_properties properties = MLT_FRAME_PROPERTIES( this );
mlt_frame frame = mlt_frame_pop_service( this );
mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
- mlt_properties_set_int( frame_properties, "width", mlt_properties_get_int( properties, "width" ) );
- mlt_properties_set_int( frame_properties, "height", mlt_properties_get_int( properties, "height" ) );
mlt_properties_set( frame_properties, "rescale.interp", mlt_properties_get( properties, "rescale.interp" ) );
+ mlt_properties_set_int( frame_properties, "rescale_alpha", mlt_properties_get_int( properties, "resize_alpha" ) );
mlt_properties_set_int( frame_properties, "distort", mlt_properties_get_int( properties, "distort" ) );
mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "consumer_aspect_ratio" ) );
- mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_double( properties, "consumer_deinterlace" ) );
+ mlt_properties_set_int( frame_properties, "consumer_deinterlace", mlt_properties_get_int( properties, "consumer_deinterlace" ) );
mlt_properties_set( frame_properties, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
- mlt_properties_set_int( frame_properties, "normalised_width", mlt_properties_get_double( properties, "normalised_width" ) );
- mlt_properties_set_int( frame_properties, "normalised_height", mlt_properties_get_double( properties, "normalised_height" ) );
+ mlt_properties_set_int( frame_properties, "normalised_width", mlt_properties_get_int( properties, "normalised_width" ) );
+ mlt_properties_set_int( frame_properties, "normalised_height", mlt_properties_get_int( properties, "normalised_height" ) );
mlt_frame_get_image( frame, buffer, format, width, height, writable );
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( frame ) );
mlt_properties_set_int( properties, "progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
mlt_properties_set_int( properties, "distort", mlt_properties_get_int( frame_properties, "distort" ) );
}
/** Get the next frame.
+
+ TODO: This function needs to be redesigned...
*/
static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int track )
int done = 0;
mlt_frame temp = NULL;
int count = 0;
+ int image_count = 0;
// Get the properties of the parent producer
mlt_properties properties = MLT_PRODUCER_PROPERTIES( parent );
// We'll store audio and video frames to use here
mlt_frame audio = NULL;
mlt_frame video = NULL;
+ mlt_frame first_video = NULL;
// Temporary properties
mlt_properties temp_properties = NULL;
done = mlt_properties_get_int( temp_properties, "last_track" );
// Handle fx only tracks
- if ( mlt_properties_get_int( temp_properties, "meta.fx_cut" ) )
+ if ( mlt_properties_get_int( temp_properties, "fx_cut" ) )
{
- // Take all but the first placeholding producer and dump on to the image stack
- if ( video )
- {
- void *p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) );
- while ( ( p = mlt_deque_pop_front( MLT_FRAME_IMAGE_STACK( temp ) ) ) != NULL )
- mlt_deque_push_back( MLT_FRAME_IMAGE_STACK( video ), p );
- }
-
- // Take all but the first placeholding producer and dump on to the audio stack
- if ( audio )
- {
- void *p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) );
- while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL )
- mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( audio ), p );
- }
-
- // Ensure everything is hidden
- mlt_properties_set_int( temp_properties, "hide", 3 );
+ int hide = ( video == NULL ? 1 : 0 ) | ( audio == NULL ? 2 : 0 );
+ mlt_properties_set_int( temp_properties, "hide", hide );
}
// We store all frames with a destructor on the output frame
// Pick up first video and audio frames
if ( !done && !mlt_frame_is_test_audio( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 2 ) )
+ {
+ // Order of frame creation is starting to get problematic
+ if ( audio != NULL )
+ {
+ mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), producer_get_audio );
+ mlt_deque_push_front( MLT_FRAME_AUDIO_STACK( temp ), audio );
+ }
audio = temp;
+ }
if ( !done && !mlt_frame_is_test_card( temp ) && !( mlt_properties_get_int( temp_properties, "hide" ) & 1 ) )
+ {
+ if ( video != NULL )
+ {
+ mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), producer_get_image );
+ mlt_deque_push_front( MLT_FRAME_IMAGE_STACK( temp ), video );
+ }
video = temp;
+ if ( first_video == NULL )
+ first_video = temp;
+
+ // Ensure that all frames know the aspect ratio of the background
+ mlt_properties_set_double( temp_properties, "output_ratio",
+ mlt_properties_get_double( MLT_FRAME_PROPERTIES( first_video ), "aspect_ratio" ) );
+
+ mlt_properties_set_int( MLT_FRAME_PROPERTIES( temp ), "image_count", ++ image_count );
+ image_count = 1;
+ }
}
// Now stack callbacks
if ( video != NULL )
{
- mlt_properties video_properties = MLT_FRAME_PROPERTIES( video );
+ mlt_properties video_properties = MLT_FRAME_PROPERTIES( first_video );
mlt_frame_push_service( *frame, video );
mlt_frame_push_service( *frame, producer_get_image );
if ( global_feed )
mlt_properties_set_int( frame_properties, "real_height", mlt_properties_get_int( video_properties, "real_height" ) );
mlt_properties_set_int( frame_properties, "progressive", mlt_properties_get_int( video_properties, "progressive" ) );
mlt_properties_set_double( frame_properties, "aspect_ratio", mlt_properties_get_double( video_properties, "aspect_ratio" ) );
+ mlt_properties_set_int( frame_properties, "image_count", image_count );
}
else
{
projects / mlt / blobdiff