#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.
*/
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 );
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
{
- this->width = mlt_properties_get_int( this->properties, "width" );
- this->height = mlt_properties_get_int( this->properties, "height" );
+ 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;
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;
// Just to be safe, wipe the stream first
memset( stream, 0, len );
- // Copy what we have into the stream
- memcpy( stream, this->audio_buffer, this->audio_avail );
-
// Mix the audio
- SDL_MixAudio( stream, stream, len, ( int )( ( double )SDL_MIX_MAXVOLUME * volume ) );
+ SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) );
// No audio left
this->audio_avail = 0;
memset( &request, 0, sizeof( SDL_AudioSpec ) );
this->playing = 0;
request.freq = frequency;
- request.format = AUDIO_S16;
+ request.format = AUDIO_S16SYS;
request.channels = channels;
request.samples = audio_buffer;
request.callback = sdl_fill_audio;
{
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 )
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( width, height, SDL_YUY2_OVERLAY, this->sdl_screen );
- sdl_unlock_display();
}
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