X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=53310b7df4f54e90e8a9f6e566f27e7869539409;hb=8d8f700e32bf26ce7e1e72ad77fbf6890cea0f28;hp=4bc6660f1bb71d94aa45115af861a60f129587d8;hpb=c761c6d9db6ff61191717f44ea44fb0c9b6af535;p=mlt diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 4bc6660f..53310b7d 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -1,40 +1,39 @@ /* * consumer_sdl.c -- A Simple DirectMedia Layer consumer - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Copyright (C) 2003-2004, 2010 Ushodaya Enterprises Limited * Author: Dan Dennedy * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "consumer_sdl.h" +#include #include #include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include +#include "consumer_sdl_osx.h" -#ifdef __DARWIN__ -# include "consumer_sdl_osx_hack.h" -# import -# import -#endif - +extern pthread_mutex_t mlt_sdl_mutex; /** This classes definition. */ @@ -85,23 +84,13 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt via the argument, but keep it simple. */ -mlt_consumer consumer_sdl_init( char *arg ) +mlt_consumer consumer_sdl_init( mlt_profile profile, mlt_service_type type, const char *id, 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 ); // If no malloc'd and consumer init ok - if ( this != NULL && mlt_consumer_init( &this->parent, this ) == 0 ) + if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 ) { // Create the queue this->queue = mlt_deque_init( ); @@ -116,9 +105,6 @@ mlt_consumer consumer_sdl_init( char *arg ) 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 ); @@ -130,13 +116,11 @@ mlt_consumer consumer_sdl_init( char *arg ) // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); + mlt_properties_set( this->properties, "deinterlace_method", "onefield" ); // Default buffer for low latency mlt_properties_set_int( this->properties, "buffer", 1 ); - // Default progressive true - mlt_properties_set_int( this->properties, "progressive", 0 ); - // Default audio buffer mlt_properties_set_int( this->properties, "audio_buffer", 512 ); @@ -144,19 +128,21 @@ mlt_consumer consumer_sdl_init( char *arg ) this->joined = 1; // process actual param - if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) + if ( arg && sscanf( arg, "%dx%d", &this->width, &this->height ) ) + { + mlt_properties_set_int( this->properties, "_arg_size", 1 ); + } + else { this->width = mlt_properties_get_int( this->properties, "width" ); this->height = mlt_properties_get_int( this->properties, "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; - + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_DOUBLEBUF; +#if !defined(__DARWIN__) && !defined(WIN32) + this->sdl_flags |= SDL_RESIZABLE; +#endif // Allow thread to be started/stopped parent->start = consumer_start; parent->stop = consumer_stop; @@ -188,13 +174,81 @@ int consumer_start( mlt_consumer parent ) if ( !this->running ) { + int video_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "video_off" ); + int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" ); + int display_off = video_off | preview_off; + int audio_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ); + int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ); + consumer_stop( parent ); this->running = 1; this->joined = 0; - this->width = mlt_properties_get_int( this->properties, "width" ); - this->height = mlt_properties_get_int( this->properties, "height" ); + if ( ! mlt_properties_get_int( this->properties, "_arg_size" ) ) + { + if ( mlt_properties_get_int( this->properties, "width" ) > 0 ) + this->width = mlt_properties_get_int( this->properties, "width" ); + if ( mlt_properties_get_int( this->properties, "height" ) > 0 ) + this->height = mlt_properties_get_int( this->properties, "height" ); + } + + this->bpp = mlt_properties_get_int( this->properties, "bpp" ); + + if ( sdl_started == 0 && display_off == 0 ) + { + pthread_mutex_lock( &mlt_sdl_mutex ); + int ret = SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + if ( ret < 0 ) + { + mlt_log_error( MLT_CONSUMER_SERVICE(parent), "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 ( display_off == 0 ) + { + pthread_mutex_lock( &mlt_sdl_mutex ); + this->sdl_screen = SDL_GetVideoSurface( ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + } + + if ( audio_off == 0 ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); + + // Default window size + if ( mlt_properties_get_int( this->properties, "_arg_size" ) ) + { + this->window_width = this->width; + this->window_height = this->height; + } + else + { + double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); + this->window_width = ( double )this->height * display_ratio + 0.5; + this->window_height = this->height; + } + + if ( this->sdl_screen == NULL && display_off == 0 ) + { + if ( mlt_properties_get_int( this->properties, "fullscreen" ) ) + { + const SDL_VideoInfo *vi; + pthread_mutex_lock( &mlt_sdl_mutex ); + vi = SDL_GetVideoInfo(); + pthread_mutex_unlock( &mlt_sdl_mutex ); + this->window_width = vi->current_w; + this->window_height = vi->current_h; + this->sdl_flags |= SDL_FULLSCREEN; + SDL_ShowCursor( SDL_DISABLE ); + } + pthread_mutex_lock( &mlt_sdl_mutex ); + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + } pthread_create( &this->thread, NULL, consumer_thread, this ); } @@ -212,7 +266,32 @@ int consumer_stop( mlt_consumer parent ) // Kill the thread and clean up this->joined = 1; this->running = 0; - pthread_join( this->thread, NULL ); +#ifndef WIN32 + if ( this->thread ) +#endif + 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" ) ) + { + pthread_mutex_lock( &this->audio_mutex ); + pthread_cond_broadcast( &this->audio_cond ); + pthread_mutex_unlock( &this->audio_mutex ); + SDL_QuitSubSystem( SDL_INIT_AUDIO ); + } + + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + { + pthread_mutex_lock( &mlt_sdl_mutex ); + SDL_Quit( ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + } + + this->sdl_screen = NULL; } return 0; @@ -226,15 +305,20 @@ int consumer_is_stopped( mlt_consumer parent ) static int sdl_lock_display( ) { + pthread_mutex_lock( &mlt_sdl_mutex ); SDL_Surface *screen = SDL_GetVideoSurface( ); - return screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 ); + int result = screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + return result; } static void sdl_unlock_display( ) { + pthread_mutex_lock( &mlt_sdl_mutex ); SDL_Surface *screen = SDL_GetVideoSurface( ); if ( screen != NULL && SDL_MUSTLOCK( screen ) ) SDL_UnlockSurface( screen ); + pthread_mutex_unlock( &mlt_sdl_mutex ); } static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) @@ -269,9 +353,6 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int 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, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); @@ -290,10 +371,11 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud { // Get the properties of this consumer mlt_properties properties = this->properties; - mlt_audio_format afmt = mlt_audio_pcm; + mlt_audio_format afmt = mlt_audio_s16; // Set the preferred params of the test card signal int channels = mlt_properties_get_int( properties, "channels" ); + int dest_channels = channels; int frequency = mlt_properties_get_int( properties, "frequency" ); static int counter = 0; @@ -302,8 +384,9 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud int16_t *pcm; int bytes; - mlt_frame_get_audio( frame, &pcm, &afmt, &frequency, &channels, &samples ); + mlt_frame_get_audio( frame, (void**) &pcm, &afmt, &frequency, &channels, &samples ); *duration = ( ( samples * 1000 ) / frequency ); + pcm += mlt_properties_get_int( properties, "audio_offset" ); if ( mlt_properties_get_int( properties, "audio_off" ) ) { @@ -323,14 +406,14 @@ static int consumer_play_audio( consumer_sdl this, mlt_frame frame, int init_aud memset( &request, 0, sizeof( SDL_AudioSpec ) ); this->playing = 0; request.freq = frequency; - request.format = AUDIO_S16; - request.channels = channels; + request.format = AUDIO_S16SYS; + request.channels = dest_channels; request.samples = audio_buffer; request.callback = sdl_fill_audio; request.userdata = (void *)this; if ( SDL_OpenAudio( &request, &got ) != 0 ) { - fprintf( stderr, "SDL failed to open audio: %s\n", SDL_GetError() ); + mlt_log_error( MLT_CONSUMER_SERVICE( this ), "SDL failed to open audio: %s\n", SDL_GetError() ); init_audio = 2; } else if ( got.size != 0 ) @@ -343,16 +426,36 @@ 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 ); - bytes = ( samples * channels * 2 ); + + bytes = samples * dest_channels * sizeof(*pcm); pthread_mutex_lock( &this->audio_mutex ); while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); if ( this->running ) { if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) - memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + { + if ( channels == dest_channels ) + { + memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + } + else + { + int16_t *dest = (int16_t*) &this->audio_buffer[ this->audio_avail ]; + int i = samples + 1; + + while ( --i ) + { + memcpy( dest, pcm, dest_channels * sizeof(*pcm) ); + pcm += channels; + dest += dest_channels; + } + } + } else + { memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); + } this->audio_avail += bytes; } pthread_cond_broadcast( &this->audio_cond ); @@ -376,18 +479,29 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) uint8_t *image; int changed = 0; - if ( this->running && mlt_properties_get_int( properties, "video_off" ) == 0 ) + int video_off = mlt_properties_get_int( properties, "video_off" ); + int preview_off = mlt_properties_get_int( properties, "preview_off" ); + mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" ); + int display_off = video_off | preview_off; + + if ( this->running && display_off == 0 ) { // Get the image, width and height - mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt ); + void *pool = mlt_cocoa_autorelease_init(); + // Handle events if ( this->sdl_screen != NULL ) { SDL_Event event; + sdl_lock_display( ); + pthread_mutex_lock( &mlt_sdl_mutex ); changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + sdl_unlock_display( ); while ( SDL_PollEvent( &event ) ) { @@ -419,6 +533,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 ) @@ -434,21 +550,15 @@ 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(); + pthread_mutex_lock( &mlt_sdl_mutex ); 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 ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + + uint32_t color = mlt_properties_get_int( this->properties, "window_background" ); + SDL_FillRect( this->sdl_screen, NULL, color >> 8 ); + SDL_Flip( this->sdl_screen ); } if ( this->running ) @@ -500,6 +610,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) this->rect.x = ( this->window_width - this->rect.w ) / 2; this->rect.y = ( this->window_height - this->rect.h ) / 2; + this->rect.x -= this->rect.x % 2; mlt_properties_set_int( this->properties, "rect_x", this->rect.x ); mlt_properties_set_int( this->properties, "rect_y", this->rect.y ); @@ -512,16 +623,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 ) @@ -529,8 +636,19 @@ 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(); + mlt_cocoa_autorelease_close( pool ); + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); + } + else if ( this->running ) + { + vfmt = preview_format == mlt_image_none ? mlt_image_rgb24a : preview_format; + if ( !video_off ) + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "format", vfmt ); + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); } return 0; @@ -541,10 +659,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; @@ -617,6 +731,10 @@ static void *video_thread( void *arg ) start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; } } + else + { + mlt_log_debug( MLT_CONSUMER_SERVICE(&this->parent), "dropped video frame\n" ); + } // This frame can now be closed mlt_frame_close( next ); @@ -628,10 +746,6 @@ static void *video_thread( void *arg ) mlt_consumer_stopped( &this->parent ); -#ifdef __DARWIN__ - [pool release]; -#endif - return NULL; } @@ -643,13 +757,13 @@ 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; + // Convenience functionality + int terminate_on_pause = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "terminate_on_pause" ); + int terminated = 0; + // Video thread pthread_t thread; @@ -662,38 +776,16 @@ 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 ) + while( !terminated && this->running ) { // Get a frame from the attached producer frame = mlt_consumer_rt_frame( consumer ); + // Check for termination + if ( terminate_on_pause && frame != NULL ) + terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0; + // Ensure that we have a frame if ( frame != NULL ) { @@ -730,6 +822,8 @@ static void *consumer_thread( void *arg ) } } + this->running = 0; + // Kill the video thread if ( init_video == 0 ) { @@ -739,27 +833,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; } @@ -774,12 +853,13 @@ 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 if ( SDL_GetWMInfo( &wm ) == 1 ) { +#ifndef WIN32 // Check that we have the X11 wm if ( wm.subsystem == SDL_SYSWM_X11 ) { @@ -800,11 +880,12 @@ static int consumer_get_dimensions( int *width, int *height ) *width = attr.width; *height = attr.height; } +#endif } #endif // Unlock the display - sdl_lock_display(); + //sdl_unlock_display(); return changed; }