#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;
SDL_Overlay *sdl_overlay;
SDL_Rect rect;
uint8_t *buffer;
+ int bpp;
};
/** Forward references to static functions.
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 );
parent->close = consumer_close;
// get a handle on properties
- mlt_service service = mlt_consumer_service( parent );
- this->properties = mlt_service_properties( service );
+ 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 );
mlt_properties_set_int( this->properties, "progressive", 0 );
// Default audio buffer
- mlt_properties_set_int( this->properties, "audio_buffer", 1024 );
-
- // Get sample aspect ratio
- this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" );
+ mlt_properties_set_int( this->properties, "audio_buffer", 512 );
// 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
if ( !this->running )
{
- pthread_attr_t thread_attributes;
-
consumer_stop( parent );
this->running = 1;
mlt_properties_set_int( this->properties, "width", this->width );
mlt_properties_set_int( this->properties, "height", this->height );
}
+ else
+ {
+ this->width = mlt_properties_get_int( this->properties, "width" );
+ this->height = mlt_properties_get_int( this->properties, "height" );
+ }
- // Inherit the scheduling priority
- pthread_attr_init( &thread_attributes );
- pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
-
- pthread_create( &this->thread, &thread_attributes, consumer_thread, this );
+ pthread_create( &this->thread, NULL, consumer_thread, this );
}
return 0;
if ( this->joined == 0 )
{
// Kill the thread and clean up
+ this->joined = 1;
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 );
- this->joined = 1;
}
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 );
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, stream, len, ( int )( ( double )SDL_MIX_MAXVOLUME * volume ) );
// No audio left
this->audio_avail = 0;
if ( init_audio == 0 )
{
- mlt_properties properties = mlt_frame_properties( frame );
+ mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
bytes = ( samples * channels * 2 );
pthread_mutex_lock( &this->audio_mutex );
while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) )
uint8_t *image;
int changed = 0;
- if ( mlt_properties_get_int( properties, "video_off" ) == 0 )
+ if ( this->running && mlt_properties_get_int( properties, "video_off" ) == 0 )
{
// Get the image, width and height
mlt_events_fire( properties, "consumer-frame-show", frame, NULL );
SDL_Event event;
changed = consumer_get_dimensions( &this->window_width, &this->window_height );
-
+
while ( SDL_PollEvent( &event ) )
{
mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL );
}
}
- if ( width != this->width || height != this->height ||
- ( ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) &&
- ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) )
-
+ if ( width != this->width || height != this->height )
{
- this->width = width;
- this->height = height;
- this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame );
- changed = 1;
+ if ( this->sdl_overlay != NULL )
+ SDL_FreeYUVOverlay( this->sdl_overlay );
+ this->sdl_overlay = NULL;
}
if ( this->running && ( this->sdl_screen == NULL || changed ) )
{
- // Determine frame's display aspect ratio
- float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * this->width / this->height;
-
- // Determine window's new display aspect ratio
- float this_aspect = ( float )this->window_width / this->window_height;
-
// Force an overlay recreation
if ( this->sdl_overlay != NULL )
SDL_FreeYUVOverlay( this->sdl_overlay );
+ 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, 0, this->sdl_flags );
+ 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, 0, this->sdl_flags );
- SDL_Flip( this->sdl_screen );
+ 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
+ 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
+ double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height;
+
+ // Store the width and height received
+ this->width = width;
+ this->height = height;
+
// If using hardware scaler
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;
}
mlt_properties_set_int( this->properties, "rect_w", this->rect.w );
mlt_properties_set_int( this->properties, "rect_h", this->rect.h );
- if ( this->sdl_screen != NULL )
- {
- SDL_SetClipRect( this->sdl_screen, &this->rect );
- sdl_lock_display();
- this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->height, SDL_YUY2_OVERLAY, this->sdl_screen );
- sdl_unlock_display();
- }
+ SDL_SetClipRect( this->sdl_screen, &this->rect );
}
-
- if ( mlt_properties_get_int( properties, "changed" ) )
+
+ if ( this->running && this->sdl_screen != NULL && this->sdl_overlay == NULL )
{
- sdl_lock_display();
- this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
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();
- mlt_properties_set_int( properties, "changed", 0 );
}
- if ( this->sdl_screen != NULL && this->sdl_overlay != NULL )
+ if ( this->running && this->sdl_screen != NULL && this->sdl_overlay != NULL )
{
this->buffer = this->sdl_overlay->pixels[ 0 ];
sdl_lock_display();
// 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;
{
// Pop the next frame
pthread_mutex_lock( &this->video_mutex );
- while ( ( next = mlt_deque_pop_front( this->queue ) ) == NULL && this->running )
+ next = mlt_deque_pop_front( this->queue );
+ while ( next == NULL && this->running )
+ {
pthread_cond_wait( &this->video_cond, &this->video_mutex );
+ next = mlt_deque_pop_front( this->queue );
+ }
pthread_mutex_unlock( &this->video_mutex );
+ if ( !this->running || next == NULL ) break;
+
// Get the properties
- properties = mlt_frame_properties( next );
+ properties = MLT_FRAME_PROPERTIES( next );
// Get the speed of the frame
speed = mlt_properties_get_double( properties, "_speed" );
// This frame can now be closed
mlt_frame_close( next );
+ next = NULL;
}
+ if ( next != NULL )
+ mlt_frame_close( next );
+
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 };
- if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 )
+ 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 )
{
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 );
+ }
}
- SDL_InitSubSystem( SDL_INIT_AUDIO );
+ if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) )
+ SDL_InitSubSystem( SDL_INIT_AUDIO );
// Loop until told not to
while( this->running )
if ( frame != NULL )
{
// Get the frame properties
- properties = mlt_frame_properties( frame );
+ properties = MLT_FRAME_PROPERTIES( frame );
// Play audio
init_audio = consumer_play_audio( this, frame, init_audio, &duration );
if ( this->sdl_overlay != NULL )
SDL_FreeYUVOverlay( this->sdl_overlay );
- SDL_QuitSubSystem( SDL_INIT_AUDIO );
+ 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( );
+ //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_overlay = NULL;
this->audio_avail = 0;
+#ifdef __DARWIN__
+ [pool release];
+#endif
+
return NULL;
}
// Lock the display
sdl_lock_display();
+#ifndef __DARWIN__
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
*height = attr.height;
}
}
+#endif
// Unlock the display
sdl_lock_display();
consumer_sdl this = parent->child;
// Stop the consumer
- mlt_consumer_stop( parent );
+ ///mlt_consumer_stop( parent );
+
+ // Now clean up the rest
+ mlt_consumer_close( parent );
// Close the queue
mlt_deque_close( this->queue );
pthread_mutex_destroy( &this->audio_mutex );
pthread_cond_destroy( &this->audio_cond );
- // Now clean up the rest
- mlt_consumer_close( parent );
-
// Finally clean up this
free( this );
}
projects / mlt / blobdiff