pthread_cond_t audio_cond;
int window_width;
int window_height;
+ int width;
+ int height;
};
/** Forward references to static functions.
static void consumer_close( mlt_consumer parent );
static void *consumer_thread( void * );
-static void consumer_get_dimensions( int *width, int *height );
+static int consumer_get_dimensions( int *width, int *height );
/** This is what will be called by the factory - anything can be passed in
via the argument, but keep it simple.
*/
-mlt_consumer consumer_sdl_init( void *dummy )
+mlt_consumer consumer_sdl_init( char *arg )
{
// Create the consumer object
consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
pthread_mutex_init( &this->audio_mutex, NULL );
pthread_cond_init( &this->audio_cond, NULL);
- // TODO: process actual param
-
+ // 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 )
+ {
+ this->width = 720;
+ this->height = 576;
+ }
+
+
// Create the the thread
pthread_create( &this->thread, NULL, consumer_thread, this );
SDL_UnlockSurface( screen );
}
-void sdl_fill_audio( void *udata, Uint8 *stream, int len )
+void sdl_fill_audio( void *udata, uint8_t *stream, int len )
{
consumer_sdl this = udata;
// Get the service assoicated to the consumer
mlt_service service = mlt_consumer_service( consumer );
+ // Get the properties of this consumer
+ mlt_properties properties = this->properties;
+
// Define a frame pointer
mlt_frame frame;
if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
{
mlt_image_format vfmt = mlt_image_yuv422;
- int width, height;
+ int width = this->width, height = this->height;
uint8_t *image;
mlt_audio_format afmt = mlt_audio_pcm;
int samples;
int frequency;
int16_t *pcm;
+ int changed = 0;
mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
if ( init_audio == 1 )
request.freq = frequency;
request.format = AUDIO_S16;
request.channels = channels;
- request.samples = 1024;
+ request.samples = 512;
request.callback = sdl_fill_audio;
request.userdata = (void *)this;
if ( SDL_OpenAudio( &request, NULL ) < 0 )
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
- if ( width != this->window_width || height != this->window_height )
+
+ if ( sdl_screen != NULL )
{
- SDL_Rect rect;
- this->window_width = rect.w = width;
- this->window_height = rect.h = height;
+ SDL_Event event;
- // open SDL window with video overlay, if possible
- if ( sdl_screen == NULL )
- sdl_screen = SDL_SetVideoMode( width, height, 0, sdl_flags );
- if ( sdl_screen != NULL )
+ changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+
+ 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 ( sdl_screen == NULL || changed )
+ {
+ double aspect_ratio = mlt_frame_get_aspect_ratio( frame );
+
+ if ( this->window_width == 0 || this->window_height == 0 )
{
- rect.x = rect.y = 0;
+ this->window_width = width;
+ this->window_height = height;
+ }
+ // open SDL window with video overlay, if possible
+ sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, sdl_flags );
- // XXX: this is a little hack until we have some sort of aspect
- // ratio property on images.
- if ( rect.h <= 486 )
+ if ( sdl_screen != NULL )
+ {
+ SDL_Rect rect;
+ if ( this->window_width < this->window_height * aspect_ratio )
{
- rect.w = 640;
- rect.x = ( 720 - 640 ) / 2;
+ rect.w = this->window_width;
+ rect.h = this->window_width / aspect_ratio;
}
else
{
- rect.h = 540;
- rect.y = ( 576 - 540 ) / 2;
+ 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( width, height, SDL_YUY2_OVERLAY, sdl_screen );
+ sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, sdl_screen );
sdl_unlock_display();
}
}
{
if ( SDL_LockYUVOverlay( sdl_overlay ) >= 0 )
{
- memcpy( buffer, image, width * height * 2 );
+ mlt_resize_yuv422( buffer, this->width, this->height, image, width, height );
SDL_UnlockYUVOverlay( sdl_overlay );
SDL_DisplayYUVOverlay( sdl_overlay, &sdl_screen->clip_rect );
}
return NULL;
}
-static void consumer_get_dimensions( int *width, int *height )
+static int consumer_get_dimensions( int *width, int *height )
{
+ int changed = 0;
+
// SDL windows manager structure
SDL_SysWMinfo wm;
XWindowAttributes attr;
XGetWindowAttributes( display, window, &attr );
+ // Determine whether window has changed
+ changed = *width != attr.width || *height != attr.height;
+
// Return width and height
*width = attr.width;
*height = attr.height;
}
}
+
+ return changed;
}
/** Callback to allow override of the close method.
// Kill the thread and clean up
this->running = 0;
- pthread_join( this->thread, NULL );
+ pthread_mutex_lock( &this->audio_mutex );
+ pthread_cond_broadcast( &this->audio_cond );
+ pthread_mutex_unlock( &this->audio_mutex );
+
+ pthread_join( this->thread, NULL );
pthread_mutex_destroy( &this->audio_mutex );
pthread_cond_destroy( &this->audio_cond );
projects / mlt / blobdiff