X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=844a0557cd7a4ae8f7de590f46708249212d004a;hb=7abf52c63a1ad0acd2c3b2e490c768e112480e63;hp=b8ce5367b6cb1d76d354a8d175c505fa5d39ded5;hpb=74acd162455a590ca335bb7cf4de7956b37016f3;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index b8ce536..844a055 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -29,13 +29,6 @@ #include #include -#ifdef __DARWIN__ -# include "consumer_sdl_osx_hack.h" -# import -# import -#endif - - /** This classes definition. */ @@ -87,16 +80,6 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt 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 ); @@ -193,18 +176,33 @@ int consumer_start( mlt_consumer parent ) 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 ); } @@ -222,6 +220,19 @@ int consumer_stop( mlt_consumer parent ) 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; @@ -396,7 +407,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) { SDL_Event event; + sdl_lock_display( ); changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + sdl_unlock_display( ); while ( SDL_PollEvent( &event ) ) { @@ -428,6 +441,8 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } + sdl_lock_display(); + if ( width != this->width || height != this->height ) { if ( this->sdl_overlay != NULL ) @@ -443,21 +458,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ) @@ -521,16 +524,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ) @@ -538,8 +537,9 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) SDL_UnlockYUVOverlay( this->sdl_overlay ); SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); } - sdl_unlock_display(); } + + sdl_unlock_display(); } return 0; @@ -550,10 +550,6 @@ static void *video_thread( void *arg ) // 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; @@ -602,10 +598,10 @@ static void *video_thread( void *arg ) 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 ) ) @@ -637,10 +633,6 @@ static void *video_thread( void *arg ) mlt_consumer_stopped( &this->parent ); -#ifdef __DARWIN__ - [pool release]; -#endif - return NULL; } @@ -652,10 +644,6 @@ static void *consumer_thread( void *arg ) // Identify the arg consumer_sdl this = arg; -#ifdef __DARWIN__ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - // Get the consumer mlt_consumer consumer = &this->parent; @@ -671,32 +659,6 @@ static void *consumer_thread( void *arg ) 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 ) { @@ -723,7 +685,7 @@ static void *consumer_thread( void *arg ) } // 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 ); @@ -748,27 +710,12 @@ static void *consumer_thread( void *arg ) 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; } @@ -783,7 +730,7 @@ static int consumer_get_dimensions( int *width, int *height ) SDL_VERSION( &wm.version ); // Lock the display - sdl_lock_display(); + //sdl_lock_display(); #ifndef __DARWIN__ // Get the wm structure @@ -813,7 +760,7 @@ static int consumer_get_dimensions( int *width, int *height ) #endif // Unlock the display - sdl_lock_display(); + //sdl_unlock_display(); return changed; }