X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=0a9926e625a3a875f872f6e4a49d121a3c5ea5cf;hb=0f587b2;hp=6e8e12d8bd0bbbbb495948f941fed3dcb8624727;hpb=7cef152403bfa0ea30e4a3e102fe33bc75e508ab;p=mlt diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 6e8e12d8..0a9926e6 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -1,33 +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" + +extern pthread_mutex_t mlt_sdl_mutex; /** This classes definition. */ @@ -50,17 +56,16 @@ 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; int sdl_flags; - SDL_Surface *sdl_screen; SDL_Overlay *sdl_overlay; SDL_Rect rect; uint8_t *buffer; + int bpp; }; /** Forward references to static functions. @@ -78,13 +83,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 ) { // Create the consumer object - consumer_sdl this = calloc( sizeof( struct consumer_sdl_s ), 1 ); + consumer_sdl this = calloc( 1, sizeof( struct consumer_sdl_s ) ); // 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( ); @@ -96,8 +101,8 @@ 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 ); // Set the default volume mlt_properties_set_double( this->properties, "volume", 1.0 ); @@ -110,39 +115,34 @@ 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" ); + mlt_properties_set_int( this->properties, "top_field_first", -1 ); // 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", 1024 ); - - // Get sample aspect ratio - this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); + mlt_properties_set_int( this->properties, "audio_buffer", 2048 ); // 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 ) + 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 = ( float )this->height * this->display_aspect; - 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__) + this->sdl_flags |= SDL_RESIZABLE; +#endif // Allow thread to be started/stopped parent->start = consumer_start; parent->stop = consumer_stop; @@ -174,25 +174,98 @@ int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - + mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent ); + int video_off = mlt_properties_get_int( properties, "video_off" ); + int preview_off = mlt_properties_get_int( properties, "preview_off" ); + int display_off = video_off | preview_off; + int audio_off = mlt_properties_get_int( properties, "audio_off" ); + int sdl_started = mlt_properties_get_int( properties, "sdl_started" ); + char *output_display = mlt_properties_get( properties, "output_display" ); + char *window_id = mlt_properties_get( properties, "window_id" ); + char *audio_driver = mlt_properties_get( properties, "audio_driver" ); + char *video_driver = mlt_properties_get( properties, "video_driver" ); + char *audio_device = mlt_properties_get( properties, "audio_device" ); + consumer_stop( parent ); this->running = 1; this->joined = 0; - // Allow the user to force resizing to window size - if ( mlt_properties_get_int( this->properties, "resize" ) ) + if ( output_display != NULL ) + setenv( "DISPLAY", output_display, 1 ); + + if ( window_id != NULL ) + setenv( "SDL_WINDOWID", window_id, 1 ); + + if ( video_driver != NULL ) + setenv( "SDL_VIDEODRIVER", video_driver, 1 ); + + if ( audio_driver != NULL ) + setenv( "SDL_AUDIODRIVER", audio_driver, 1 ); + + if ( audio_device != NULL ) + setenv( "AUDIODEV", audio_device, 1 ); + + 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 ) { - mlt_properties_set_int( this->properties, "width", this->width ); - mlt_properties_set_int( this->properties, "height", this->height ); + 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 ); } - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + if ( audio_off == 0 ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + // 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; + } + + pthread_mutex_lock( &mlt_sdl_mutex ); + if ( !SDL_GetVideoSurface() && 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 ); + } + 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 ); } return 0; @@ -206,14 +279,32 @@ int consumer_stop( mlt_consumer parent ) if ( this->joined == 0 ) { // Kill the thread and clean up + this->joined = 1; this->running = 0; +#ifndef WIN32 + if ( this->thread ) +#endif + pthread_join( this->thread, NULL ); - pthread_mutex_lock( &this->audio_mutex ); - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); + // internal cleanup + if ( this->sdl_overlay != NULL ) + SDL_FreeYUVOverlay( this->sdl_overlay ); + this->sdl_overlay = NULL; - pthread_join( this->thread, NULL ); - this->joined = 1; + 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 ); + } } return 0; @@ -227,15 +318,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 ) @@ -243,7 +339,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 ); @@ -254,7 +350,10 @@ static void sdl_fill_audio( void *udata, uint8_t *stream, int len ) 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; @@ -267,11 +366,8 @@ 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, stream, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); + SDL_MixAudio( stream, this->audio_buffer, len, ( int )( ( float )SDL_MIX_MAXVOLUME * volume ) ); // No audio left this->audio_avail = 0; @@ -288,10 +384,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; @@ -300,8 +397,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" ) ) { @@ -321,14 +419,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 ) @@ -340,17 +438,37 @@ 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 ); + mlt_properties properties = MLT_FRAME_PROPERTIES( frame ); + + 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 ); @@ -374,19 +492,29 @@ 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 ) + 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 ); + void *pool = mlt_cocoa_autorelease_init(); + // Handle events - if ( this->sdl_screen != NULL ) + if ( SDL_GetVideoSurface() ) { 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 ) ) { mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL ); @@ -417,120 +545,123 @@ 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 ) && - ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) ) + sdl_lock_display(); + 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->sdl_screen == NULL || changed ) + if ( this->running && ( !SDL_GetVideoSurface() || 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 + pthread_mutex_lock( &mlt_sdl_mutex ); + consumer_get_dimensions( &this->window_width, &this->window_height ); + SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + + if ( screen ) + { + uint32_t color = mlt_properties_get_int( this->properties, "window_background" ); + SDL_FillRect( screen, NULL, color >> 8 ); + SDL_Flip( screen ); + } + } + + 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; } 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 ); 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 ( 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 ); - mlt_properties_set_int( properties, "changed", 0 ); - - 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( SDL_GetVideoSurface(), &this->rect ); } - - if ( mlt_properties_get_int( properties, "changed" ) ) + + if ( this->running && SDL_GetVideoSurface() && 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_unlock_display(); - mlt_properties_set_int( properties, "changed", 0 ); + SDL_SetClipRect( SDL_GetVideoSurface(), &this->rect ); + this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, SDL_GetVideoSurface() ); } - if ( this->sdl_screen != NULL && this->sdl_overlay != NULL ) + if ( this->running && SDL_GetVideoSurface() && this->sdl_overlay != NULL ) { this->buffer = this->sdl_overlay->pixels[ 0 ]; - sdl_lock_display(); if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { if ( image != NULL ) memcpy( this->buffer, image, width * height * 2 ); SDL_UnlockYUVOverlay( this->sdl_overlay ); - SDL_DisplayYUVOverlay( this->sdl_overlay, &this->sdl_screen->clip_rect ); + SDL_DisplayYUVOverlay( this->sdl_overlay, &SDL_GetVideoSurface()->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_events_fire( properties, "consumer-frame-show", frame, NULL ); } return 0; @@ -563,12 +694,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" ); @@ -583,10 +720,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 ) ) @@ -607,11 +744,20 @@ static void *video_thread( void *arg ) start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; } } + else + { + static int dropped = 0; + mlt_log_info( MLT_CONSUMER_SERVICE(&this->parent), "dropped video frame %d\n", ++dropped ); + } // This frame can now be closed mlt_frame_close( next ); + next = NULL; } + if ( next != NULL ) + mlt_frame_close( next ); + mlt_consumer_stopped( &this->parent ); return NULL; @@ -628,6 +774,10 @@ static void *consumer_thread( void *arg ) // 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; @@ -635,43 +785,23 @@ static void *consumer_thread( void *arg ) int init_audio = 1; int init_video = 1; mlt_frame frame = NULL; - mlt_properties properties = NULL; int duration = 0; int64_t playtime = 0; struct timespec tm = { 0, 100000 }; - 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 ) - consumer_get_dimensions( &this->window_width, &this->window_height ); - mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 1 ); - } - - SDL_InitSubSystem( SDL_INIT_AUDIO ); - // Loop until told not to while( this->running ) { // Get a frame from the attached producer - frame = mlt_consumer_rt_frame( consumer ); + frame = !terminated? mlt_consumer_rt_frame( consumer ) : NULL; + + // Check for termination + if ( terminate_on_pause && frame ) + terminated = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ) == 0.0; // Ensure that we have a frame - if ( frame != NULL ) + if ( frame ) { - // Get the frame properties - properties = mlt_frame_properties( frame ); - // Play audio init_audio = consumer_play_audio( this, frame, init_audio, &duration ); @@ -686,7 +816,7 @@ static void *consumer_thread( void *arg ) } // Set playtime for this frame - mlt_properties_set_position( properties, "playtime", playtime ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "playtime", playtime ); while ( this->running && mlt_deque_count( this->queue ) > 15 ) nanosleep( &tm, NULL ); @@ -700,6 +830,24 @@ static void *consumer_thread( void *arg ) // Calculate the next playtime playtime += ( duration * 1000 ); } + else if ( terminated ) + { + if ( init_video || mlt_deque_count( this->queue ) == 0 ) + break; + else + nanosleep( &tm, NULL ); + } + } + + this->running = 0; + + // Unblock sdl_preview + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "put_mode" ) == 1 ) + { + frame = mlt_consumer_get_frame( consumer ); + if ( frame ) + mlt_frame_close( frame ); + frame = NULL; } // Kill the video thread @@ -711,20 +859,9 @@ static void *consumer_thread( void *arg ) pthread_join( thread, NULL ); } - // internal cleanup - if ( this->sdl_overlay != NULL ) - SDL_FreeYUVOverlay( this->sdl_overlay ); - - 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; return NULL; @@ -741,11 +878,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 ) { @@ -766,10 +905,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; } @@ -783,7 +924,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 ); @@ -792,9 +936,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 ); }