X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=7ee177dd31111222071c7848ea23472baec6f3d5;hb=42bd0aedb6d3d65bedb98479adcdbaeb326dfee9;hp=714fc66f5a6351512192b8b14b781d74601415ac;hpb=1a50e779cfd5e1bc6a80054f6f56e64280c2dc41;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 714fc66..7ee177d 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,10 +95,12 @@ 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 ); + // process actual param if ( arg == NULL || !strcmp( arg, "PAL" ) ) { @@ -106,6 +111,7 @@ mlt_consumer consumer_sdl_init( char *arg ) { this->width = 720; this->height = 480; + mlt_properties_set_double( this->properties, "fps", 29.97 ); } else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { @@ -121,8 +127,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; @@ -135,6 +143,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( ); @@ -199,9 +246,16 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud // Get the properties of this consumer mlt_properties properties = this->properties; mlt_audio_format afmt = mlt_audio_pcm; - int channels; - int samples; - int frequency; + + // Set the preferred params of the test card signal + 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; int bytes; @@ -218,6 +272,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud SDL_AudioSpec request; 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 ) ); this->playing = 0; @@ -232,13 +289,10 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); init_audio = 2; } - else + else if ( got.size != 0 ) { - if ( got.size != 0 ) - { - SDL_PauseAudio( 0 ); - init_audio = 0; - } + SDL_PauseAudio( 0 ); + init_audio = 0; } } @@ -249,7 +303,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 ); @@ -320,9 +374,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 ) - callback( producer, SDL_GetKeyName(event.key.keysym.sym) ); + 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; } @@ -460,6 +518,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; } @@ -509,19 +571,14 @@ 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 ); - // Now clean up the rest (the close = NULL is a bit nasty but needed for now) - parent->close = NULL; + // Now clean up the rest mlt_consumer_close( parent ); // Finally clean up this