/*
* consumer_sdl.c -- A Simple DirectMedia Layer consumer
- * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2004, 2010 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
* This library is free software; you can redistribute it and/or
#include <framework/mlt_deque.h>
#include <framework/mlt_factory.h>
#include <framework/mlt_filter.h>
+#include <framework/mlt_log.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_syswm.h>
+#include <SDL.h>
+#include <SDL_syswm.h>
#include <sys/time.h>
+#include "consumer_sdl_osx.h"
+
+extern pthread_mutex_t mlt_sdl_mutex;
/** This classes definition.
*/
SDL_Rect rect;
uint8_t *buffer;
int bpp;
- int filtered;
};
/** Forward references to static functions.
// Default scaler (for now we'll use nearest)
mlt_properties_set( this->properties, "rescale", "nearest" );
+ mlt_properties_set( this->properties, "deinterlace_method", "onefield" );
// Default buffer for low latency
mlt_properties_set_int( this->properties, "buffer", 1 );
- // Default progressive true
- mlt_properties_set_int( this->properties, "progressive", 0 );
-
// Default audio buffer
mlt_properties_set_int( this->properties, "audio_buffer", 512 );
this->joined = 1;
// process actual param
- if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
+ if ( arg && sscanf( arg, "%dx%d", &this->width, &this->height ) )
+ {
+ mlt_properties_set_int( this->properties, "_arg_size", 1 );
+ }
+ else
{
this->width = mlt_properties_get_int( this->properties, "width" );
this->height = mlt_properties_get_int( this->properties, "height" );
}
-
+
// Set the sdl flags
this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF;
this->running = 1;
this->joined = 0;
- if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
- this->width = mlt_properties_get_int( this->properties, "width" );
- if ( mlt_properties_get_int( this->properties, "height" ) > 0 )
- this->height = mlt_properties_get_int( this->properties, "height" );
+ if ( ! mlt_properties_get_int( this->properties, "_arg_size" ) )
+ {
+ if ( mlt_properties_get_int( this->properties, "width" ) > 0 )
+ this->width = mlt_properties_get_int( this->properties, "width" );
+ if ( mlt_properties_get_int( this->properties, "height" ) > 0 )
+ this->height = mlt_properties_get_int( this->properties, "height" );
+ }
this->bpp = mlt_properties_get_int( this->properties, "bpp" );
- // Attach a colour space converter
- if ( preview_off && !this->filtered )
- {
- mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) );
- mlt_filter filter = mlt_factory_filter( profile, "avcolour_space", NULL );
- if ( filter )
- {
- mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 );
- mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter );
- mlt_filter_close( filter );
- }
- this->filtered = 1;
- }
-
if ( sdl_started == 0 && display_off == 0 )
{
- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ int ret = SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ if ( ret < 0 )
{
- fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
+ mlt_log_error( MLT_CONSUMER_SERVICE(parent), "Failed to initialize SDL: %s\n", SDL_GetError() );
return -1;
}
}
else if ( display_off == 0 )
{
+ pthread_mutex_lock( &mlt_sdl_mutex );
this->sdl_screen = SDL_GetVideoSurface( );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
}
if ( audio_off == 0 )
SDL_InitSubSystem( SDL_INIT_AUDIO );
// Default window size
- double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
- this->window_width = ( double )this->height * display_ratio;
- this->window_height = this->height;
+ if ( mlt_properties_get_int( this->properties, "_arg_size" ) )
+ {
+ this->window_width = this->width;
+ this->window_height = this->height;
+ }
+ else
+ {
+ double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+ this->window_width = ( double )this->height * display_ratio;
+ this->window_height = this->height;
+ }
if ( this->sdl_screen == NULL && display_off == 0 )
{
if ( mlt_properties_get_int( this->properties, "fullscreen" ) )
{
- const SDL_VideoInfo *vi = SDL_GetVideoInfo();
+ const SDL_VideoInfo *vi;
+ pthread_mutex_lock( &mlt_sdl_mutex );
+ vi = SDL_GetVideoInfo();
+ pthread_mutex_unlock( &mlt_sdl_mutex );
this->window_width = vi->current_w;
this->window_height = vi->current_h;
this->sdl_flags |= SDL_FULLSCREEN;
SDL_ShowCursor( SDL_DISABLE );
}
+ pthread_mutex_lock( &mlt_sdl_mutex );
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
}
pthread_create( &this->thread, NULL, consumer_thread, this );
// Kill the thread and clean up
this->joined = 1;
this->running = 0;
- pthread_join( this->thread, NULL );
+#ifndef WIN32
+ if ( this->thread )
+#endif
+ pthread_join( this->thread, NULL );
// internal cleanup
if ( this->sdl_overlay != NULL )
}
if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ {
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Quit( );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ }
this->sdl_screen = NULL;
}
static int sdl_lock_display( )
{
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Surface *screen = SDL_GetVideoSurface( );
- return screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 );
+ int result = screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+ return result;
}
static void sdl_unlock_display( )
{
+ pthread_mutex_lock( &mlt_sdl_mutex );
SDL_Surface *screen = SDL_GetVideoSurface( );
if ( screen != NULL && SDL_MUSTLOCK( screen ) )
SDL_UnlockSurface( screen );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
}
static void sdl_fill_audio( void *udata, uint8_t *stream, int len )
{
// Get the properties of this consumer
mlt_properties properties = this->properties;
- mlt_audio_format afmt = mlt_audio_pcm;
+ mlt_audio_format afmt = mlt_audio_s16;
// Set the preferred params of the test card signal
int channels = mlt_properties_get_int( properties, "channels" );
+ int dest_channels = channels;
int frequency = mlt_properties_get_int( properties, "frequency" );
static int counter = 0;
int16_t *pcm;
int bytes;
- mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples );
+ mlt_frame_get_audio( frame, (void**) &pcm, &afmt, &frequency, &channels, &samples );
*duration = ( ( samples * 1000 ) / frequency );
+ pcm += mlt_properties_get_int( properties, "audio_offset" );
if ( mlt_properties_get_int( properties, "audio_off" ) )
{
this->playing = 0;
request.freq = frequency;
request.format = AUDIO_S16SYS;
- request.channels = channels;
+ request.channels = dest_channels;
request.samples = audio_buffer;
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() );
+ mlt_log_error( MLT_CONSUMER_SERVICE( this ), "SDL failed to open audio: %s\n", SDL_GetError() );
init_audio = 2;
}
else if ( got.size != 0 )
if ( init_audio == 0 )
{
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- bytes = ( samples * channels * 2 );
+
+ bytes = samples * dest_channels * sizeof(*pcm);
pthread_mutex_lock( &this->audio_mutex );
while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) )
pthread_cond_wait( &this->audio_cond, &this->audio_mutex );
if ( this->running )
{
if ( mlt_properties_get_double( properties, "_speed" ) == 1 )
- memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes );
+ {
+ if ( channels == dest_channels )
+ {
+ memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes );
+ }
+ else
+ {
+ int16_t *dest = (int16_t*) &this->audio_buffer[ this->audio_avail ];
+ int i = samples + 1;
+
+ while ( --i )
+ {
+ memcpy( dest, pcm, dest_channels * sizeof(*pcm) );
+ pcm += channels;
+ dest += dest_channels;
+ }
+ }
+ }
else
+ {
memset( &this->audio_buffer[ this->audio_avail ], 0, bytes );
+ }
this->audio_avail += bytes;
}
pthread_cond_broadcast( &this->audio_cond );
// Get the image, width and height
mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt );
- mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
+ void *pool = mlt_cocoa_autorelease_init();
+
// Handle events
if ( this->sdl_screen != NULL )
{
SDL_Event event;
sdl_lock_display( );
+ pthread_mutex_lock( &mlt_sdl_mutex );
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
sdl_unlock_display( );
while ( SDL_PollEvent( &event ) )
this->sdl_overlay = NULL;
// open SDL window with video overlay, if possible
+ pthread_mutex_lock( &mlt_sdl_mutex );
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
if ( consumer_get_dimensions( &this->window_width, &this->window_height ) )
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
+ pthread_mutex_unlock( &mlt_sdl_mutex );
+
+ uint32_t color = mlt_properties_get_int( this->properties, "window_background" );
+ SDL_FillRect( this->sdl_screen, NULL, color >> 8 );
+ SDL_Flip( this->sdl_screen );
}
if ( this->running )
}
sdl_unlock_display();
+ mlt_cocoa_autorelease_close( pool );
+ mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
}
else if ( this->running )
{
start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000;
}
}
+ else
+ {
+ mlt_log_debug( MLT_CONSUMER_SERVICE(&this->parent), "dropped video frame\n" );
+ }
// This frame can now be closed
mlt_frame_close( next );
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
+#ifndef WIN32
// Check that we have the X11 wm
if ( wm.subsystem == SDL_SYSWM_X11 )
{
*width = attr.width;
*height = attr.height;
}
+#endif
}
#endif
projects / mlt / blobdiff