X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=adc60b42cd1b64fff011aa743372b885ea0b7836;hb=ae748aa4403b44430bbf57b49aa6f386f15d8407;hp=dfce3d1ad10a3268192f6726af71f65e3c1a427d;hpb=4c96cb2b639338d6308dd473983b9b4cbb9e27c9;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index dfce3d1..adc60b4 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -29,6 +29,13 @@ #include #include +#ifdef __DARWIN__ +# include "consumer_sdl_osx_hack.h" +# import +# import +#endif + + /** This classes definition. */ @@ -50,9 +57,8 @@ struct consumer_sdl_s 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; @@ -61,6 +67,7 @@ struct consumer_sdl_s SDL_Overlay *sdl_overlay; SDL_Rect rect; uint8_t *buffer; + int bpp; }; /** Forward references to static functions. @@ -80,6 +87,16 @@ 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 ); @@ -96,9 +113,12 @@ mlt_consumer consumer_sdl_init( char *arg ) 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 ); @@ -118,43 +138,22 @@ mlt_consumer consumer_sdl_init( char *arg ) 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 ) { this->width = mlt_properties_get_int( this->properties, "width" ); this->height = mlt_properties_get_int( this->properties, "height" ); - - // Default window size - this->window_width = ( float )this->height * this->display_aspect; - this->window_height = this->height; - } - else - { - if ( (int)( ( float )this->width / this->height * 1000 ) != - (int)( this->display_aspect * 1000 ) ) - { - // Override these - this->display_aspect = ( float )this->width / this->height; - this->aspect_ratio = 1.0; - mlt_properties_set_double( this->properties, "aspect_ratio", this->aspect_ratio ); - } - - // Set window size - this->window_width = this->width; - this->window_height = this->height; } + // Default window size + this->window_width = ( double )this->height * display_ratio; + this->window_height = this->height; + // Set the sdl flags this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; @@ -189,8 +188,6 @@ int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - consumer_stop( parent ); this->running = 1; @@ -202,12 +199,13 @@ int consumer_start( mlt_consumer parent ) 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; @@ -221,14 +219,9 @@ int consumer_stop( mlt_consumer parent ) 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; @@ -258,7 +251,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) 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 ); @@ -286,7 +279,7 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int 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, stream, len, ( int )( ( double )SDL_MIX_MAXVOLUME * volume ) ); // No audio left this->audio_avail = 0; @@ -355,7 +348,7 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud 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 ) ) @@ -389,7 +382,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ); @@ -401,7 +394,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ); @@ -432,66 +425,82 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( width != this->width || height != this->height || - ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) ) + if ( width != this->width || height != this->height ) { - if ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) - { - 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->sdl_screen == NULL || changed ) + if ( this->running && ( this->sdl_screen == NULL || changed ) ) + { + // 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, 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 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; + 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; } @@ -502,36 +511,20 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) mlt_properties_set_int( this->properties, "rect_y", this->rect.y ); mlt_properties_set_int( this->properties, "rect_w", this->rect.w ); mlt_properties_set_int( this->properties, "rect_h", this->rect.h ); - - // Force an overlay recreation - if ( this->sdl_overlay != NULL ) - SDL_FreeYUVOverlay( this->sdl_overlay ); - // 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 ); - sdl_unlock_display(); - - 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(); @@ -554,6 +547,10 @@ 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; @@ -576,12 +573,18 @@ static void *video_thread( void *arg ) { // 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" ); @@ -623,10 +626,18 @@ static void *video_thread( void *arg ) // 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; } @@ -638,6 +649,10 @@ 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; @@ -653,14 +668,31 @@ static void *consumer_thread( void *arg ) int64_t playtime = 0; struct timespec tm = { 0, 100000 }; - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 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 ) + { + 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 { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; + 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_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); - SDL_EnableUNICODE( 1 ); + if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "audio_off" ) ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); // Loop until told not to while( this->running ) @@ -672,7 +704,7 @@ static void *consumer_thread( void *arg ) 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 ); @@ -716,7 +748,12 @@ static void *consumer_thread( void *arg ) // internal cleanup if ( this->sdl_overlay != NULL ) SDL_FreeYUVOverlay( this->sdl_overlay ); - SDL_Quit( ); + + 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 ) ); @@ -725,6 +762,10 @@ static void *consumer_thread( void *arg ) this->sdl_overlay = NULL; this->audio_avail = 0; +#ifdef __DARWIN__ + [pool release]; +#endif + return NULL; } @@ -741,6 +782,7 @@ static int consumer_get_dimensions( int *width, int *height ) // Lock the display sdl_lock_display(); +#ifndef __DARWIN__ // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { @@ -765,6 +807,7 @@ static int consumer_get_dimensions( int *width, int *height ) *height = attr.height; } } +#endif // Unlock the display sdl_lock_display(); @@ -781,7 +824,10 @@ static void consumer_close( mlt_consumer parent ) 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 ); @@ -790,9 +836,6 @@ static void consumer_close( mlt_consumer parent ) 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 ); }