X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=3d4f53146de07a12156e911e9f3177ad8ac16e8e;hb=abc466844ef298c20f1530c1f287de40445762a4;hp=e56d56c71294fa63bbf87041e2c64a9989f37094;hpb=7c518e80321a87a22d2e48835442c9f5b70dcd17;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index e56d56c..3d4f531 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -62,6 +62,9 @@ struct consumer_sdl_s /** Forward references to static functions. */ +static int consumer_start( mlt_consumer parent ); +static int consumer_stop( mlt_consumer parent ); +static int consumer_is_stopped( mlt_consumer parent ); static void consumer_close( mlt_consumer parent ); static void *consumer_thread( void * ); static int consumer_get_dimensions( int *width, int *height ); @@ -92,13 +95,15 @@ mlt_consumer consumer_sdl_init( char *arg ) mlt_properties_set_double( this->properties, "volume", 1.0 ); // This is the initialisation of the consumer - this->running = 1; pthread_mutex_init( &this->audio_mutex, NULL ); pthread_cond_init( &this->audio_cond, NULL); // Default fps mlt_properties_set_double( this->properties, "fps", 25 ); + // Default scaler (for now we'll use nearest) + mlt_properties_set( this->properties, "rescale", "nearest" ); + // process actual param if ( arg == NULL || !strcmp( arg, "PAL" ) ) { @@ -125,8 +130,10 @@ mlt_consumer consumer_sdl_init( char *arg ) // Set the sdl flags this->sdl_flags = SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE; - // Create the the thread - pthread_create( &this->thread, NULL, consumer_thread, this ); + // Allow thread to be started/stopped + parent->start = consumer_start; + parent->stop = consumer_stop; + parent->is_stopped = consumer_is_stopped; // Return the consumer produced return parent; @@ -139,6 +146,45 @@ mlt_consumer consumer_sdl_init( char *arg ) return NULL; } +int consumer_start( mlt_consumer parent ) +{ + consumer_sdl this = parent->child; + + if ( !this->running ) + { + this->running = 1; + pthread_create( &this->thread, NULL, consumer_thread, this ); + } + + return 0; +} + +int consumer_stop( mlt_consumer parent ) +{ + // Get the actual object + consumer_sdl this = parent->child; + + if ( this->running ) + { + // Kill the thread and clean up + this->running = 0; + + pthread_mutex_lock( &this->audio_mutex ); + pthread_cond_broadcast( &this->audio_cond ); + pthread_mutex_unlock( &this->audio_mutex ); + + pthread_join( this->thread, NULL ); + } + + return 0; +} + +int consumer_is_stopped( mlt_consumer parent ) +{ + consumer_sdl this = parent->child; + return !this->running; +} + static int sdl_lock_display( ) { SDL_Surface *screen = SDL_GetVideoSurface( ); @@ -208,6 +254,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud int channels = 2; int frequency = 48000; static int counter = 0; + if ( mlt_properties_get_int( properties, "frequency" ) != 0 ) + frequency = mlt_properties_get_int( properties, "frequency" ); + int samples = mlt_sample_calculator( mlt_properties_get_double( this->properties, "fps" ), frequency, counter++ ); int16_t *pcm; @@ -227,6 +276,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud SDL_AudioSpec got; SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + SDL_EnableUNICODE( 1 ); // specify audio format memset( &request, 0, sizeof( SDL_AudioSpec ) ); @@ -256,7 +306,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); mlt_properties properties = mlt_frame_properties( frame ); - if ( mlt_properties_get_double( properties, "speed" ) == 1 ) + if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); else memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); @@ -295,6 +345,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } this->queue[ this->count ++ ] = frame; + if ( mlt_properties_get( properties, "rescale" ) != NULL ) + mlt_properties_set( mlt_frame_properties( frame ), "rescale.interp", mlt_properties_get( properties, "rescale" ) ); + if ( this->playing ) { // We're working on the oldest frame now @@ -327,11 +380,13 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) case SDL_KEYDOWN: { mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); + char keyboard[ 2 ] = " "; void (*callback)( mlt_producer, char * ) = mlt_properties_get_data( properties, "transport_callback", NULL ); - if ( callback != NULL && producer != NULL && strcmp( SDL_GetKeyName(event.key.keysym.sym), "space" ) ) - callback( producer, SDL_GetKeyName(event.key.keysym.sym) ); - else if ( callback != NULL && producer != NULL && !strcmp( SDL_GetKeyName(event.key.keysym.sym), "space" ) ) - callback( producer, " " ); + if ( callback != NULL && producer != NULL && event.key.keysym.unicode < 0x80 && event.key.keysym.unicode > 0 ) + { + keyboard[ 0 ] = ( char )event.key.keysym.unicode; + callback( producer, keyboard ); + } } break; } @@ -469,6 +524,10 @@ static void *consumer_thread( void *arg ) SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); + this->sdl_screen = NULL; + this->sdl_overlay = NULL; + this->audio_avail = 0; + return NULL; } @@ -518,14 +577,10 @@ static void consumer_close( mlt_consumer parent ) // Get the actual object consumer_sdl this = parent->child; - // Kill the thread and clean up - this->running = 0; - - pthread_mutex_lock( &this->audio_mutex ); - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); + // Stop the consumer + mlt_consumer_stop( parent ); - pthread_join( this->thread, NULL ); + // Destroy mutexes pthread_mutex_destroy( &this->audio_mutex ); pthread_cond_destroy( &this->audio_cond );