X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=2725d1df715f55d3078866176c15575dd7b00cea;hb=8bf137cd71aafb9c8f6a42c78ddb6bd0a8fe99db;hp=cf02c737e7c00317e71e2a0fca31e20f0d6fbcc4;hpb=092636b85449e57fd33ffd4954a2de23c2a5f81c;p=melted diff --git a/mlt/src/modules/sdl/consumer_sdl.c b/mlt/src/modules/sdl/consumer_sdl.c index cf02c73..2725d1d 100644 --- a/mlt/src/modules/sdl/consumer_sdl.c +++ b/mlt/src/modules/sdl/consumer_sdl.c @@ -40,14 +40,23 @@ struct consumer_sdl_s int video; pthread_t thread; int running; - uint8_t audio_buffer[ 4096 * 6 ]; + uint8_t audio_buffer[ 4096 * 3 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; int window_width; int window_height; + float aspect_ratio; int width; int height; + int playing; + mlt_frame *queue; + int size; + int count; + int sdl_flags; + SDL_Surface *sdl_screen; + SDL_Overlay *sdl_overlay; + uint8_t *buffer; }; /** Forward references to static functions. @@ -104,6 +113,13 @@ mlt_consumer consumer_sdl_init( char *arg ) this->height = 576; } + // Default window size and aspect ratio + this->aspect_ratio = 4.0 / 3.0; + 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 ); @@ -132,7 +148,7 @@ static void sdl_unlock_display( ) SDL_UnlockSurface( screen ); } -void sdl_fill_audio( void *udata, uint8_t *stream, int len ) +static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) { consumer_sdl this = udata; @@ -141,7 +157,7 @@ void sdl_fill_audio( void *udata, uint8_t *stream, int len ) pthread_mutex_lock( &this->audio_mutex ); - // Experimental - block until audio received + // Block until audio received while ( this->running && len > this->audio_avail ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); @@ -170,194 +186,275 @@ void sdl_fill_audio( void *udata, uint8_t *stream, int len ) // No audio left this->audio_avail = 0; } + + // We're definitely playing now + this->playing = 1; + pthread_cond_broadcast( &this->audio_cond ); pthread_mutex_unlock( &this->audio_mutex ); } -/** Threaded wrapper for pipe. -*/ - -static void *consumer_thread( void *arg ) +static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio ) { - // Identify the arg - consumer_sdl this = arg; + // Get the properties of this consumer + mlt_properties properties = this->properties; + mlt_audio_format afmt = mlt_audio_pcm; + int channels = 0; + int samples; + int frequency; + int16_t *pcm; + int bytes; - // Get the consumer - mlt_consumer consumer = &this->parent; + mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); - // Get the service assoicated to the consumer - mlt_service service = mlt_consumer_service( consumer ); + if ( mlt_properties_get_int( properties, "audio_off" ) ) + { + this->playing = 1; + return init_audio; + } + + if ( init_audio == 1 ) + { + SDL_AudioSpec request; + SDL_AudioSpec got; + + // specify audio format + memset( &request, 0, sizeof( SDL_AudioSpec ) ); + this->playing = 0; + request.freq = frequency; + request.format = AUDIO_S16; + request.channels = channels; + request.samples = 1024; + request.callback = sdl_fill_audio; + request.userdata = (void *)this; + if ( SDL_OpenAudio( &request, &got ) != 0 ) + { + fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); + init_audio = 2; + } + else if ( got.size != 0 ) + { + SDL_PauseAudio( 0 ); + init_audio = 0; + } + } + + if ( init_audio == 0 ) + { + bytes = ( samples * channels * 2 ); + pthread_mutex_lock( &this->audio_mutex ); + 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 ) + memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + else + memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); + this->audio_avail += bytes; + pthread_cond_broadcast( &this->audio_cond ); + pthread_mutex_unlock( &this->audio_mutex ); + } + else + { + this->playing = 1; + } + + return init_audio; +} +static int consumer_play_video( consumer_sdl this, mlt_frame frame ) +{ // Get the properties of this consumer mlt_properties properties = this->properties; - // Define a frame pointer - mlt_frame frame; + mlt_image_format vfmt = mlt_image_yuv422; + int width = this->width, height = this->height; + uint8_t *image; + int changed = 0; - // internal intialization - int sdl_flags = SDL_HWSURFACE | SDL_DOUBLEBUF | SDL_HWACCEL | SDL_RESIZABLE; - SDL_Surface *sdl_screen = NULL; - SDL_Overlay *sdl_overlay = NULL; - uint8_t *buffer = NULL; - int init_audio = 1; - int bytes; + if ( mlt_properties_get_int( properties, "video_off" ) ) + { + mlt_frame_close( frame ); + return 0; + } - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) + if ( this->count == this->size ) { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; + this->size += 25; + this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size ); } - - // Loop until told not to - while( this->running ) + this->queue[ this->count ++ ] = frame; + + if ( this->playing ) { - // Get a frame from the service (should never return anything other than 0) - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + // We're working on the oldest frame now + frame = this->queue[ 0 ]; + + // Shunt the frames in the queue down + int i = 0; + for ( i = 1; i < this->count; i ++ ) + this->queue[ i - 1 ] = this->queue[ i ]; + this->count --; + + // Get the image, width and height + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + + if ( this->sdl_screen != NULL ) { - mlt_image_format vfmt = mlt_image_yuv422; - int width = this->width, height = this->height; - uint8_t *image; - - mlt_audio_format afmt = mlt_audio_pcm; - int channels; - int samples; - int frequency; - int16_t *pcm; - int changed = 0; - - mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); - if ( init_audio == 1 ) + SDL_Event event; + + changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + + while ( SDL_PollEvent( &event ) ) { - SDL_AudioSpec request; - - // specify audio format - request.freq = frequency; - request.format = AUDIO_S16; - request.channels = channels; - request.samples = 512; - request.callback = sdl_fill_audio; - request.userdata = (void *)this; - if ( SDL_OpenAudio( &request, NULL ) < 0 ) + switch( event.type ) { - fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); - break; + case SDL_VIDEORESIZE: + this->window_width = event.resize.w; + this->window_height = event.resize.h; + changed = 1; + break; + case SDL_KEYDOWN: + { + mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); + 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) ); + } + break; } - SDL_PauseAudio( 0 ); - init_audio = 0; } - bytes = ( samples * channels * 2 ); - pthread_mutex_lock( &this->audio_mutex ); - while ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) - pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); - memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); - this->audio_avail += bytes; - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); - // Get the image, width and height - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + } - if ( sdl_screen != NULL ) - { - SDL_Event event; + if ( width != this->width || height != this->height ) + { + this->width = width; + this->height = height; + changed = 1; + } - changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + if ( this->sdl_screen == NULL || changed ) + { + double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); + float display_aspect_ratio = (float)width / (float)height; + SDL_Rect rect; - while ( SDL_PollEvent( &event ) ) - { - switch( event.type ) - { - case SDL_VIDEORESIZE: - this->window_width = event.resize.w; - this->window_height = event.resize.h; - changed = 1; - break; - case SDL_KEYDOWN: - { - mlt_producer producer = mlt_properties_get_data( properties, "transport_producer", NULL ); - 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) ); - } - break; - } - } + if ( mlt_properties_get_double( properties, "aspect_ratio" ) ) + aspect_ratio = mlt_properties_get_double( properties, "aspect_ratio" ); + + if ( aspect_ratio == 1 ) + { + rect.w = this->window_width; + rect.h = this->window_height; + } + else if ( this->window_width < this->window_height * aspect_ratio ) + { + rect.w = this->window_width; + rect.h = this->window_width / aspect_ratio; + } + else + { + rect.w = this->window_height * aspect_ratio; + rect.h = this->window_height; } - if ( sdl_screen == NULL || changed ) + if ( mlt_properties_get_int( properties, "scale_overlay" ) ) { - double aspect_ratio = mlt_frame_get_aspect_ratio( frame ); + if ( ( float )rect.w * display_aspect_ratio < this->window_width ) + rect.w = ( int )( ( float )rect.w * display_aspect_ratio ); + else if ( ( float )rect.h * display_aspect_ratio < this->window_height ) + rect.h = ( int )( ( float )rect.h * display_aspect_ratio ); + } - if ( this->window_width == 0 || this->window_height == 0 ) - { - this->window_width = width; - this->window_height = height; - } + rect.x = ( this->window_width - rect.w ) / 2; + rect.y = ( this->window_height - rect.h ) / 2; - // open SDL window with video overlay, if possible - sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, sdl_flags ); + // Force an overlay recreation + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); - if ( sdl_screen != NULL ) - { - SDL_Rect rect; - if ( this->window_width < this->window_height * aspect_ratio ) - { - rect.w = this->window_width; - rect.h = this->window_width / aspect_ratio; - } - else - { - rect.w = this->window_height * aspect_ratio; - rect.h = this->window_height; - } - - rect.x = ( this->window_width - rect.w ) / 2; - rect.y = ( this->window_height - rect.h ) / 2; - - SDL_SetClipRect( sdl_screen, &rect ); - - // Force an overlay recreation - if ( sdl_overlay != NULL ) - SDL_FreeYUVOverlay( sdl_overlay ); - sdl_lock_display(); - sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, sdl_screen ); - sdl_unlock_display(); - } - } - - if ( sdl_screen != NULL && sdl_overlay != NULL ) + // open SDL window with video overlay, if possible + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + + if ( this->sdl_screen != NULL ) { - buffer = sdl_overlay->pixels[ 0 ]; - if ( sdl_lock_display() ) - { - if ( SDL_LockYUVOverlay( sdl_overlay ) >= 0 ) - { - mlt_resize_yuv422( buffer, this->width, this->height, image, width, height ); - SDL_UnlockYUVOverlay( sdl_overlay ); - SDL_DisplayYUVOverlay( sdl_overlay, &sdl_screen->clip_rect ); - } - sdl_unlock_display(); - } + SDL_SetClipRect( this->sdl_screen, &rect ); + + sdl_lock_display(); + this->sdl_overlay = SDL_CreateYUVOverlay( this->width - (this->width % 4), this->height- (this->height % 2 ), SDL_YUY2_OVERLAY, this->sdl_screen ); + sdl_unlock_display(); } - else + } + + if ( this->sdl_screen != NULL && this->sdl_overlay != NULL ) + { + this->buffer = this->sdl_overlay->pixels[ 0 ]; + if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { - // TODO: allocate buffer? + mlt_resize_yuv422( this->buffer, this->width - (this->width % 4 ), this->height- (this->height % 2 ), image, width, height ); + SDL_UnlockYUVOverlay( this->sdl_overlay ); + SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); } - - // Close the frame - mlt_frame_close( frame ); } - else + } + else + { + frame = NULL; + } + + // Close the frame + if ( frame != NULL ) + mlt_frame_close( frame ); + + if ( this->count ) + mlt_frame_get_image( this->queue[ this->count - 1 ], &image, &vfmt, &width, &height, 0 ); + + return 0; +} + +/** Threaded wrapper for pipe. +*/ + +static void *consumer_thread( void *arg ) +{ + // Identify the arg + consumer_sdl this = 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; + + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) + { + fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); + return NULL; + } + + // 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 ) { - break; + init_audio = consumer_play_audio( this, frame, init_audio ); + consumer_play_video( this, frame ); } - } // while + } // internal cleanup if ( init_audio == 0 ) SDL_AudioQuit( ); - if ( sdl_overlay != NULL ) - SDL_FreeYUVOverlay( sdl_overlay ); + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); SDL_Quit( ); return NULL;