From 51de85d7a61e44bde5395629af348d9ca96ee13b Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Sat, 22 May 2004 09:54:23 +0000 Subject: [PATCH] slight mods to factory (for future module reporting); pool purge function; consumer drop frame rework git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@315 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/framework/configure | 2 +- src/framework/mlt_consumer.c | 24 ++++++++++++++++-------- src/framework/mlt_factory.c | 8 ++++---- src/framework/mlt_pool.c | 28 ++++++++++++++++++++++++++++ src/framework/mlt_pool.h | 1 + src/framework/mlt_repository.c | 1 + 6 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/framework/configure b/src/framework/configure index bdc61c3..3a765aa 100755 --- a/src/framework/configure +++ b/src/framework/configure @@ -1,2 +1,2 @@ -#!/bin/bash +#!/bin/sh echo "framework -I$prefix/include/mlt -D_REENTRANT -lmlt" >> ../../packages.dat diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 92d1927..2837c4c 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -268,7 +268,8 @@ static void *consumer_read_ahead_thread( void *arg ) int skipped = 0; int64_t time_wait = 0; int64_t time_frame = 0; - int64_t time_image = 0; + int64_t time_process = 0; + int skip_next = 0; // Get the first frame frame = mlt_consumer_get_frame( this ); @@ -293,14 +294,13 @@ static void *consumer_read_ahead_thread( void *arg ) while ( this->ahead ) { // Put the current frame into the queue - time_difference( &ante ); pthread_mutex_lock( &this->mutex ); while( this->ahead && mlt_deque_count( this->queue ) >= buffer ) pthread_cond_wait( &this->cond, &this->mutex ); mlt_deque_push_back( this->queue, frame ); pthread_cond_broadcast( &this->cond ); pthread_mutex_unlock( &this->mutex ); - time_wait = time_difference( &ante ); + time_wait += time_difference( &ante ); // Get the next frame frame = mlt_consumer_get_frame( this ); @@ -314,12 +314,14 @@ static void *consumer_read_ahead_thread( void *arg ) { skipped = 0; time_frame = 0; - time_image = 0; + time_process = 0; + time_wait = 0; count = 1; + skip_next = 0; } // Get the image - if ( ( time_frame + time_image ) / count < 40000 ) + if ( !skip_next ) { // Get the image, mark as rendered and time it if ( !video_off ) @@ -333,14 +335,16 @@ static void *consumer_read_ahead_thread( void *arg ) { // Increment the number of sequentially skipped frames skipped ++; + skip_next = 0; // If we've reached an unacceptable level, reset everything if ( skipped > 10 ) { skipped = 0; time_frame = 0; - time_image = 0; - count = 0; + time_process = 0; + time_wait = 0; + count = 1; } } @@ -353,7 +357,11 @@ static void *consumer_read_ahead_thread( void *arg ) } // Increment the time take for this frame - time_image += time_difference( &ante ); + time_process += time_difference( &ante ); + + // Determine if the next frame should be skipped + if ( mlt_deque_count( this->queue ) <= 5 && ( ( time_wait + time_frame + time_process ) / count ) > 40000 ) + skip_next = 1; } // Remove the last frame diff --git a/src/framework/mlt_factory.c b/src/framework/mlt_factory.c index 38ac605..e7aac0f 100644 --- a/src/framework/mlt_factory.c +++ b/src/framework/mlt_factory.c @@ -71,10 +71,10 @@ int mlt_factory_init( char *prefix ) object_list = mlt_properties_new( ); // Create a repository for each service type - producers = mlt_repository_init( object_list, prefix, "producers.dat", "mlt_create_producer" ); - filters = mlt_repository_init( object_list, prefix, "filters.dat", "mlt_create_filter" ); - transitions = mlt_repository_init( object_list, prefix, "transitions.dat", "mlt_create_transition" ); - consumers = mlt_repository_init( object_list, prefix, "consumers.dat", "mlt_create_consumer" ); + producers = mlt_repository_init( object_list, prefix, "producers", "mlt_create_producer" ); + 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" ); } return 0; diff --git a/src/framework/mlt_pool.c b/src/framework/mlt_pool.c index 87da0df..ee1d244 100644 --- a/src/framework/mlt_pool.c +++ b/src/framework/mlt_pool.c @@ -294,6 +294,34 @@ void *mlt_pool_realloc( void *ptr, int size ) return result; } +/** Purge unused items in the pool. +*/ + +void mlt_pool_purge( ) +{ + int i = 0; + + // For each pool + for ( i = 0; i < mlt_properties_count( pools ); i ++ ) + { + // Get the pool + mlt_pool this = mlt_properties_get_data_at( pools, i, NULL ); + + // Pointer to unused memory + void *release = NULL; + + // Lock the pool + pthread_mutex_lock( &this->lock ); + + // We'll free all unused items now + while ( ( release = mlt_deque_pop_back( this->stack ) ) != NULL ) + free( release - sizeof( struct mlt_release_s ) ); + + // Unlock the pool + pthread_mutex_unlock( &this->lock ); + } +} + /** Release the allocated memory. */ diff --git a/src/framework/mlt_pool.h b/src/framework/mlt_pool.h index 682a960..22e95a3 100644 --- a/src/framework/mlt_pool.h +++ b/src/framework/mlt_pool.h @@ -25,6 +25,7 @@ extern void mlt_pool_init( ); extern void *mlt_pool_alloc( int size ); extern void *mlt_pool_realloc( void *ptr, int size ); extern void mlt_pool_release( void *release ); +extern void mlt_pool_purge( ); extern void mlt_pool_close( ); #endif diff --git a/src/framework/mlt_repository.c b/src/framework/mlt_repository.c index f121511..cdda3db 100644 --- a/src/framework/mlt_repository.c +++ b/src/framework/mlt_repository.c @@ -130,6 +130,7 @@ mlt_repository mlt_repository_init( mlt_properties object_list, char *prefix, ch // Construct full file construct_full_file( full_file, prefix, data ); + strcat( full_file, ".dat" ); // Open the file file = fopen( full_file, "r" ); -- 1.7.4.4