git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@434
d19143bc-622f-0410-bfdd-
b5b2a6649095
filters = mlt_repository_init( object_list, prefix, "filters", "mlt_create_filter" );
transitions = mlt_repository_init( object_list, prefix, "transitions", "mlt_create_transition" );
consumers = mlt_repository_init( object_list, prefix, "consumers", "mlt_create_consumer" );
filters = mlt_repository_init( object_list, prefix, "filters", "mlt_create_filter" );
transitions = mlt_repository_init( object_list, prefix, "transitions", "mlt_create_transition" );
consumers = mlt_repository_init( object_list, prefix, "consumers", "mlt_create_consumer" );
+
+ // Force a clean up when app closes
+ atexit( mlt_factory_close );
/** Memory leak checks.
*/
/** Memory leak checks.
*/
-//#define _MLT_PROPERTY_CHECKS_
+#define _MLT_PROPERTY_CHECKS_
#ifdef _MLT_PROPERTY_CHECKS_
static int properties_created = 0;
#ifdef _MLT_PROPERTY_CHECKS_
static int properties_created = 0;
static void main_cleanup( )
{
static void main_cleanup( )
{
- miracle_server_shutdown( server );
+ miracle_server_close( server );
}
/** Report usage and exit.
}
/** Report usage and exit.
int background = 1;
struct timespec tm = { 5, 0 };
int background = 1;
struct timespec tm = { 5, 0 };
+ mlt_factory_init( NULL );
+
server = miracle_server_init( argv[ 0 ] );
for ( index = 1; index < argc; index ++ )
server = miracle_server_init( argv[ 0 ] );
for ( index = 1; index < argc; index ++ )
#ifdef linux
//pthread_kill_other_threads_np();
miracle_log( LOG_DEBUG, "Clean shutdown." );
#ifdef linux
//pthread_kill_other_threads_np();
miracle_log( LOG_DEBUG, "Clean shutdown." );
- free( local );
- mlt_factory_close( );
+ //free( local );
+ //mlt_factory_close( );
{
server->shutdown = 1;
pthread_join( server->thread, NULL );
{
server->shutdown = 1;
pthread_join( server->thread, NULL );
- valerie_parser_close( server->parser );
miracle_server_set_config( server, NULL );
miracle_server_set_config( server, NULL );
+ valerie_parser_close( server->parser );
+ server->parser = NULL;
close( server->socket );
}
}
close( server->socket );
}
}
+
+/** Close the server.
+*/
+
+void miracle_server_close( miracle_server server )
+{
+ if ( server != NULL )
+ {
+ miracle_server_shutdown( server );
+ free( server );
+ }
+}
extern void miracle_server_set_proxy( miracle_server, char * );
extern int miracle_server_execute( miracle_server );
extern void miracle_server_shutdown( miracle_server );
extern void miracle_server_set_proxy( miracle_server, char * );
extern int miracle_server_execute( miracle_server );
extern void miracle_server_shutdown( miracle_server );
+extern void miracle_server_close( miracle_server );
// Get the b frame and process with composite if successful
if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 )
{
// Get the b frame and process with composite if successful
if ( mlt_service_get_frame( service, &b_frame, 0 ) == 0 )
{
- // Set the b frame to be in the same position
+ // Get the a and b frame properties
+ mlt_properties a_props = mlt_frame_properties( frame );
+ mlt_properties b_props = mlt_frame_properties( b_frame );
+
+ // Set the b frame to be in the same position and have same consumer requirements
mlt_frame_set_position( b_frame, position );
mlt_frame_set_position( b_frame, position );
+ mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+ mlt_properties_set_int( b_props, "consumer_progressive", mlt_properties_get_double( a_props, "consumer_progressive" ) );
if ( mlt_properties_get_int( properties, "reverse" ) == 0 )
{
if ( mlt_properties_get_int( properties, "reverse" ) == 0 )
{
- mlt_properties a_props = mlt_frame_properties( frame );
- mlt_properties b_props = mlt_frame_properties( b_frame );
mlt_transition_process( composite, b_frame, frame );
mlt_properties_set( a_props, "rescale.interp", "nearest" );
mlt_properties_set( b_props, "rescale.interp", "nearest" );
mlt_transition_process( composite, b_frame, frame );
mlt_properties_set( a_props, "rescale.interp", "nearest" );
mlt_properties_set( b_props, "rescale.interp", "nearest" );
- mlt_properties_set_int( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 );
error = mlt_frame_get_image( b_frame, image, format, width, height, 1 );
mlt_properties_set_data( b_props, "image", *image, 0, NULL, NULL );
mlt_service_apply_filters( mlt_filter_service( this ), frame, 0 );
error = mlt_frame_get_image( b_frame, image, format, width, height, 1 );
mlt_properties_set_data( b_props, "image", *image, 0, NULL, NULL );
{
y_src = -y;
height_src -= y_src;
{
y_src = -y;
height_src -= y_src;
}
// crop overlay below bottom edge of frame
}
// crop overlay below bottom edge of frame