#include <SDL/SDL_syswm.h>
#include <sys/time.h>
-#ifdef __DARWIN__
-# include "consumer_sdl_osx_hack.h"
-# import <AppKit/NSApplication.h>
-# import <Foundation/Foundation.h>
-#endif
-
-
/** This classes definition.
*/
pthread_cond_t video_cond;
int window_width;
int window_height;
- float aspect_ratio;
- float display_aspect;
- double last_frame_aspect;
+ int previous_width;
+ int previous_height;
int width;
int height;
int playing;
mlt_consumer consumer_sdl_init( char *arg )
{
-#ifdef __DARWIN__
- // Initialize Cocoa
- NSApplicationLoad();
- [NSApplication sharedApplication];
-
- // Spawn a fake thread so that cocoa knows to be multithreaded
- DummyThread *dummy = [[DummyThread alloc] init];
- [NSThread detachNewThreadSelector:@selector(startThread:) toTarget:dummy withObject:nil];
-#endif
-
// Create the consumer object
consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 );
mlt_service service = MLT_CONSUMER_SERVICE( parent );
this->properties = MLT_SERVICE_PROPERTIES( service );
+ // Default display aspect ratio
+ double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" );
+
// Set the default volume
mlt_properties_set_double( this->properties, "volume", 1.0 );
// Default audio buffer
mlt_properties_set_int( this->properties, "audio_buffer", 512 );
- // Get sample aspect ratio
- this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
-
// Ensure we don't join on a non-running object
this->joined = 1;
- // Default display aspect ratio
- this->display_aspect = 4.0 / 3.0;
-
// process actual param
if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 )
{
}
// Default window size
- this->window_width = ( float )this->height * this->display_aspect;
+ this->window_width = ( double )this->height * display_ratio;
this->window_height = this->height;
// Set the sdl flags
this->running = 1;
this->joined = 0;
- // Allow the user to force resizing to window size
- if ( mlt_properties_get_int( this->properties, "resize" ) )
+ this->width = mlt_properties_get_int( this->properties, "width" );
+ this->height = mlt_properties_get_int( this->properties, "height" );
+
+ this->bpp = mlt_properties_get_int( this->properties, "bpp" );
+
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
{
- mlt_properties_set_int( this->properties, "width", this->width );
- mlt_properties_set_int( this->properties, "height", this->height );
+ if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
+ {
+ fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
+ return -1;
+ }
+
+ SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
+ SDL_EnableUNICODE( 1 );
}
+ else
+ {
+ if ( SDL_GetVideoSurface( ) != NULL )
+ this->sdl_screen = SDL_GetVideoSurface( );
+ }
+
+ if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+ SDL_InitSubSystem( SDL_INIT_AUDIO );
+
+ this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
pthread_create( &this->thread, NULL, consumer_thread, this );
}
this->joined = 1;
this->running = 0;
pthread_join( this->thread, NULL );
+
+ // internal cleanup
+ if ( this->sdl_overlay != NULL )
+ SDL_FreeYUVOverlay( this->sdl_overlay );
+ this->sdl_overlay = NULL;
+
+ if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
+ SDL_QuitSubSystem( SDL_INIT_AUDIO );
+
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ SDL_Quit( );
+
+ this->sdl_screen = NULL;
}
return 0;
consumer_sdl this = udata;
// Get the volume
- float volume = mlt_properties_get_double( this->properties, "volume" );
+ double volume = mlt_properties_get_double( this->properties, "volume" );
pthread_mutex_lock( &this->audio_mutex );
if ( this->audio_avail >= len )
{
// Place in the audio buffer
- memcpy( stream, this->audio_buffer, len );
+ if ( volume != 1.0 )
+ SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
+ else
+ memcpy( stream, this->audio_buffer, len );
// Remove len from the audio available
this->audio_avail -= len;
memcpy( stream, this->audio_buffer, this->audio_avail );
// Mix the audio
- SDL_MixAudio( stream, stream, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
+ SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
// No audio left
this->audio_avail = 0;
{
SDL_Event event;
+ sdl_lock_display( );
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
+ sdl_unlock_display( );
while ( SDL_PollEvent( &event ) )
{
}
}
+ sdl_lock_display();
+
if ( width != this->width || height != this->height )
{
if ( this->sdl_overlay != NULL )
this->sdl_overlay = NULL;
// open SDL window with video overlay, if possible
- sdl_lock_display();
this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
- sdl_unlock_display();
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 );
- //SDL_Flip( this->sdl_screen );
- mlt_properties_set_int( properties, "changed", 0 );
- }
- else if ( mlt_properties_get_int( properties, "changed" ) )
- {
- sdl_lock_display();
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags );
- SDL_SetClipRect( this->sdl_screen, &this->rect );
- sdl_unlock_display();
- mlt_properties_set_int( properties, "changed", 0 );
}
if ( this->running )
{
// Determine window's new display aspect ratio
- float this_aspect = ( float )this->window_width / this->window_height;
+ double this_aspect = ( double )this->window_width / this->window_height;
+
+ // Get the display aspect ratio
+ double display_ratio = mlt_properties_get_double( properties, "display_ratio" );
// Determine frame's display aspect ratio
- float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+ double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+
+ // Store the width and height received
this->width = width;
this->height = height;
if ( mlt_properties_get( properties, "rescale" ) != NULL &&
!strcmp( mlt_properties_get( properties, "rescale" ), "none" ) )
{
- // Special case optimisation to negate odd effect of sample aspect ratio
- // not corresponding exactly with image resolution.
- if ( ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) ) &&
- ( (int)( mlt_frame_get_aspect_ratio( frame ) * 1000 ) == (int)( this->aspect_ratio * 1000 ) ) )
+ // Use hardware scaler to normalise display aspect ratio
+ this->rect.w = frame_aspect / this_aspect * this->window_width;
+ this->rect.h = this->window_height;
+ if ( this->rect.w > this->window_width )
{
this->rect.w = this->window_width;
- this->rect.h = this->window_height;
- }
- else
- {
- // Use hardware scaler to normalise display aspect ratio
- this->rect.w = frame_aspect / this_aspect * this->window_width;
- this->rect.h = this->window_height;
- if ( this->rect.w > this->window_width )
- {
- this->rect.w = this->window_width;
- this->rect.h = this_aspect / frame_aspect * this->window_height;
- }
+ this->rect.h = this_aspect / frame_aspect * this->window_height;
}
}
// Special case optimisation to negate odd effect of sample aspect ratio
// not corresponding exactly with image resolution.
- else if ( (int)( this_aspect * 1000 ) == (int)( this->display_aspect * 1000 ) )
+ else if ( (int)( this_aspect * 1000 ) == (int)( display_ratio * 1000 ) )
{
this->rect.w = this->window_width;
this->rect.h = this->window_height;
}
// Use hardware scaler to normalise sample aspect ratio
- else if ( this->window_height * this->display_aspect > this->window_width )
+ else if ( this->window_height * display_ratio > this->window_width )
{
this->rect.w = this->window_width;
- this->rect.h = this->window_width / this->display_aspect;
+ this->rect.h = this->window_width / display_ratio;
}
else
{
- this->rect.w = this->window_height * this->display_aspect;
+ this->rect.w = this->window_height * display_ratio;
this->rect.h = this->window_height;
}
if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
{
SDL_SetClipRect( this->sdl_screen, &this->rect );
- SDL_Flip( this->sdl_screen );
- sdl_lock_display();
- this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen );
- sdl_unlock_display();
+ this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
}
if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
{
this->buffer = this->sdl_overlay->pixels[ 0 ];
- sdl_lock_display();
if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 )
{
if ( image != NULL )
SDL_UnlockYUVOverlay( this->sdl_overlay );
SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect );
}
- sdl_unlock_display();
}
+
+ sdl_unlock_display();
}
return 0;
// Identify the arg
consumer_sdl this = arg;
-#ifdef __DARWIN__
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-#endif
-
// Obtain time of thread start
struct timeval now;
int64_t start = 0;
if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running )
{
// Obtain the scheduled playout time
- mlt_position scheduled = mlt_properties_get_position( properties, "playtime" );
+ int64_t scheduled = mlt_properties_get_int( properties, "playtime" );
// Determine the difference between the elapsed time and the scheduled playout time
- mlt_position difference = scheduled - elapsed;
+ int64_t difference = scheduled - elapsed;
// Smooth playback a bit
if ( real_time && ( difference > 20000 && speed == 1.0 ) )
mlt_consumer_stopped( &this->parent );
-#ifdef __DARWIN__
- [pool release];
-#endif
-
return NULL;
}
// Identify the arg
consumer_sdl this = arg;
-#ifdef __DARWIN__
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-#endif
-
// Get the consumer
mlt_consumer consumer = &this->parent;
int64_t playtime = 0;
struct timespec tm = { 0, 100000 };
- this->bpp = mlt_properties_get_int( this->properties, "bpp" );
-
- if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 )
- {
- if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
- {
- fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
- return NULL;
- }
-
- SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
- SDL_EnableUNICODE( 1 );
- }
- else
- {
- if ( SDL_GetVideoSurface( ) != NULL )
- {
- this->sdl_screen = SDL_GetVideoSurface( );
- consumer_get_dimensions( &this->window_width, &this->window_height );
- mlt_properties_set_int( this->properties, "changed", 0 );
- }
- }
-
- if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) )
- SDL_InitSubSystem( SDL_INIT_AUDIO );
-
// Loop until told not to
while( this->running )
{
}
// Set playtime for this frame
- mlt_properties_set_position( properties, "playtime", playtime );
+ mlt_properties_set_int( properties, "playtime", playtime );
while ( this->running && mlt_deque_count( this->queue ) > 15 )
nanosleep( &tm, NULL );
pthread_join( thread, NULL );
}
- // internal cleanup
- if ( this->sdl_overlay != NULL )
- SDL_FreeYUVOverlay( this->sdl_overlay );
-
- if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) )
- SDL_QuitSubSystem( SDL_INIT_AUDIO );
-
- //if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 )
- //SDL_Quit( );
-
while( mlt_deque_count( this->queue ) )
mlt_frame_close( mlt_deque_pop_back( this->queue ) );
this->sdl_screen = NULL;
- this->sdl_overlay = NULL;
this->audio_avail = 0;
-#ifdef __DARWIN__
- [pool release];
-#endif
-
return NULL;
}
SDL_VERSION( &wm.version );
// Lock the display
- sdl_lock_display();
+ //sdl_lock_display();
#ifndef __DARWIN__
// Get the wm structure
#endif
// Unlock the display
- sdl_lock_display();
+ //sdl_unlock_display();
return changed;
}
projects / melted / blobdiff