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.
*/
+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 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 );
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);
- // TODO: process actual param
-
- // Create the the thread
- pthread_create( &this->thread, NULL, consumer_thread, this );
+ // Default fps
+ mlt_properties_set_double( this->properties, "fps", 25 );
+
+ // 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;
+ mlt_properties_set_double( this->properties, "fps", 29.97 );
+ }
+ else if ( sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
+ {
+ this->width = 720;
+ 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;
+
+ // 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;
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( );
SDL_UnlockSurface( screen );
}
-void sdl_fill_audio( void *udata, Uint8 *stream, int len )
+static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
{
consumer_sdl this = udata;
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 );
// 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 );
}
+static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_audio )
+{
+ // Get the properties of this consumer
+ mlt_properties properties = this->properties;
+ mlt_audio_format afmt = mlt_audio_pcm;
+
+ // 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;
+
+ mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+
+ if ( mlt_properties_get_int( properties, "audio_off" ) )
+ {
+ this->playing = 1;
+ return init_audio;
+ }
+
+ if ( init_audio == 1 )
+ {
+ 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;
+ 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;
+
+ mlt_image_format vfmt = mlt_image_yuv422;
+ int width = this->width, height = this->height;
+ uint8_t *image;
+ int changed = 0;
+
+ if ( mlt_properties_get_int( properties, "video_off" ) )
+ {
+ mlt_frame_close( frame );
+ return 0;
+ }
+
+ if ( this->count == this->size )
+ {
+ this->size += 25;
+ this->queue = realloc( this->queue, sizeof( mlt_frame ) * this->size );
+ }
+ this->queue[ this->count ++ ] = frame;
+
+ if ( this->playing )
+ {
+ // 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 )
+ {
+ SDL_Event event;
+
+ 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 );
+ char keyboard[ 2 ] = " ";
+ void (*callback)( mlt_producer, char * ) = mlt_properties_get_data( properties, "transport_callback", NULL );
+ 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;
+ }
+ }
+
+ }
+
+ if ( width != this->width || height != this->height )
+ {
+ this->width = width;
+ this->height = height;
+ changed = 1;
+ }
+
+ 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;
+
+ 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 ( mlt_properties_get_int( properties, "scale_overlay" ) )
+ {
+ 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 );
+ }
+
+ rect.x = ( this->window_width - rect.w ) / 2;
+ rect.y = ( this->window_height - rect.h ) / 2;
+
+ // Force an overlay recreation
+ if ( this->sdl_overlay != NULL )
+ SDL_FreeYUVOverlay( this->sdl_overlay );
+
+ // 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 )
+ {
+ 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();
+ }
+ }
+
+ if ( this->sdl_screen != NULL && this->sdl_overlay != NULL )
+ {
+ this->buffer = this->sdl_overlay->pixels[ 0 ];
+ if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
+ {
+ 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 );
+ }
+ }
+ }
+ 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.
*/
mlt_frame frame;
// 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 ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 )
{
// Get a frame from the service (should never return anything other than 0)
if ( mlt_service_get_frame( service, &frame, 0 ) == 0 )
{
- mlt_image_format vfmt = mlt_image_yuv422;
- int width, height;
- uint8_t *image;
-
- mlt_audio_format afmt = mlt_audio_pcm;
- int channels;
- int samples;
- int frequency;
- int16_t *pcm;
-
- mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
- if ( init_audio == 1 )
- {
- SDL_AudioSpec request;
-
- // specify audio format
- 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, NULL ) < 0 )
- {
- fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() );
- 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 ( width != this->window_width || height != this->window_height )
- {
- SDL_Rect rect;
- this->window_width = rect.w = width;
- this->window_height = rect.h = height;
-
- // 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 )
- {
- rect.x = rect.y = 0;
-
-
- // XXX: this is a little hack until we have some sort of aspect
- // ratio property on images.
- if ( rect.h <= 486 )
- {
- rect.w = 640;
- rect.x = ( 720 - 640 ) / 2;
- }
- else
- {
- rect.h = 540;
- rect.y = ( 576 - 540 ) / 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_unlock_display();
- }
- }
-
- if ( sdl_screen != NULL && sdl_overlay != NULL )
- {
- buffer = sdl_overlay->pixels[ 0 ];
- if ( sdl_lock_display() )
- {
- if ( SDL_LockYUVOverlay( sdl_overlay ) >= 0 )
- {
- memcpy( buffer, image, width * height * 2 );
- SDL_UnlockYUVOverlay( sdl_overlay );
- SDL_DisplayYUVOverlay( sdl_overlay, &sdl_screen->clip_rect );
- }
- sdl_unlock_display();
- }
- }
- else
- {
- // TODO: allocate buffer?
- }
-
- // Close the frame
- mlt_frame_close( frame );
- }
- else
- {
- 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( );
+ this->sdl_screen = NULL;
+ this->sdl_overlay = NULL;
+ this->audio_avail = 0;
+
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.
// 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
projects / melted / blobdiff