X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=2e5f70c751d5f06e84433330c11617da6a3807d8;hb=f8811178ffae672a6789df3e645cdc5d9ad6c5cc;hp=85852d5703bbcff886966b1d060a475994964b85;hpb=9390e8b584f3f717f0a326893c0e37cf187a0a51;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 85852d5..2e5f70c 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,37 +95,36 @@ 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 scaler (for now we'll use nearest) + mlt_properties_set( this->properties, "rescale", "nearest" ); + + // Default progressive true + mlt_properties_set_int( this->properties, "progressive", 1 ); + + // Get aspect ratio + this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + // process actual param - if ( arg == NULL || !strcmp( arg, "PAL" ) ) - { - this->width = 720; - this->height = 576; - } - else if ( !strcmp( arg, "NTSC" ) ) - { - this->width = 720; - this->height = 480; - } - else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) + if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { - this->width = 720; - this->height = 576; + this->width = mlt_properties_get_int( this->properties, "width" ); + this->height = mlt_properties_get_int( this->properties, "height" ); } - // Default window size and aspect ratio - this->aspect_ratio = 4.0 / 3.0; + // Default window size this->window_width = (int)( (float)this->height * this->aspect_ratio ) + 1; this->window_height = this->height; - + // 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 +137,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 +240,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 +266,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; @@ -246,7 +297,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 ); @@ -317,9 +368,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; } @@ -408,7 +463,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) mlt_frame_close( frame ); if ( this->count ) + { + // Tell the producers about our scale relative to the normalisation + mlt_properties_set_double( mlt_frame_properties( this->queue[ this->count - 1 ] ), "consumer_scale", + ( double )height / mlt_properties_get_double( properties, "height" ) ); mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 ); + } return 0; } @@ -424,12 +484,6 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; - // Get the service assoicated to the consumer - mlt_service service = mlt_consumer_service( consumer ); - - // Define a frame pointer - mlt_frame frame; - // internal intialization int init_audio = 1; @@ -442,9 +496,16 @@ static void *consumer_thread( void *arg ) // Loop until told not to while( this->running ) { - // Get a frame from the service (should never return anything other than 0) - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + // Get a frame from the attached producer + mlt_frame frame = mlt_consumer_get_frame( consumer ); + + // Ensure that we have a frame + if ( frame != NULL ) { + // SDL adapts display aspect, but set this so pixel aspect can be normalised +// mlt_properties_set_double( mlt_frame_properties( frame ), "consumer_aspect_ratio", +// mlt_frame_get_aspect_ratio( frame ) ); + init_audio = consumer_play_audio( this, frame, init_audio ); consumer_play_video( this, frame ); } @@ -457,6 +518,13 @@ static void *consumer_thread( void *arg ) SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); + while( -- this->count >= 0 ) + mlt_frame_close( this->queue[ this->count ] ); + + this->sdl_screen = NULL; + this->sdl_overlay = NULL; + this->audio_avail = 0; + return NULL; } @@ -506,19 +574,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