#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
/** Forward references to static methods.
*/
}
/** 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 )
// Handle fx only tracks
if ( mlt_properties_get_int( temp_properties, "meta.fx_cut" ) )
{
- // Take all but the first placeholding producer and dump on to the image stack
+ mlt_properties copy = video == NULL ? frame_properties : MLT_FRAME_PROPERTIES( video );
+ int i = 0;
+
+ for ( i = 0; i < mlt_properties_count( temp_properties ); i ++ )
+ {
+ char *name = mlt_properties_get_name( temp_properties, i );
+ char *value = mlt_properties_get_value( temp_properties, i );
+ // For animated filters
+ if ( isdigit( name[ 0 ] ) && value != NULL )
+ mlt_properties_set( copy, name, value );
+ }
+
if ( video )
{
+ // Take all but the first placeholding producer and dump on to the image stack
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 );
}
+ else
+ {
+ mlt_frame_push_service( *frame, temp );
+ mlt_frame_push_service( *frame, producer_get_image );
+ mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
+ }
- // 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 ) );
+ // Take all but the first placeholding producer and dump on to the audio stack
+ void *p = !mlt_frame_is_test_audio( temp ) ? mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) : NULL;
while ( ( p = mlt_deque_pop_front( MLT_FRAME_AUDIO_STACK( temp ) ) ) != NULL )
mlt_deque_push_back( MLT_FRAME_AUDIO_STACK( audio ), p );
}
+ else
+ {
+ mlt_frame_push_audio( *frame, temp );
+ mlt_frame_push_audio( *frame, producer_get_audio );
+ mlt_properties_set_int( frame_properties, "meta.fx_cut", 1 );
+ }
// Ensure everything is hidden
mlt_properties_set_int( temp_properties, "hide", 3 );
// 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;
+ }
}
// Now stack callbacks