X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=9870e448ea668199afa3c4684afbaf12cfc50e26;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=23ff27c90d87ee6c66663bca2f5d005f6aef83ce;hpb=9f05ea86ef01cc51ed3c7b6a1d3495255e571d67;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index 23ff27c..9870e44 100644 --- a/src/modules/sdl/consumer_sdl.c +++ b/src/modules/sdl/consumer_sdl.c @@ -3,24 +3,26 @@ * Copyright (C) 2003-2004 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 @@ -40,6 +42,7 @@ struct consumer_sdl_s mlt_properties properties; mlt_deque queue; pthread_t thread; + int joined; int running; uint8_t audio_buffer[ 4096 * 10 ]; int audio_avail; @@ -49,9 +52,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; @@ -60,6 +62,8 @@ struct consumer_sdl_s SDL_Overlay *sdl_overlay; SDL_Rect rect; uint8_t *buffer; + int bpp; + int filtered; }; /** Forward references to static functions. @@ -71,18 +75,19 @@ static int consumer_is_stopped( mlt_consumer parent ); static void consumer_close( mlt_consumer parent ); static void *consumer_thread( void * ); static int consumer_get_dimensions( int *width, int *height ); +static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ); /** This is what will be called by the factory - anything can be passed in 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 ); // 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( ); @@ -94,8 +99,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 ); @@ -116,38 +121,16 @@ 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 ); + mlt_properties_set_int( this->properties, "audio_buffer", 512 ); - // Get sample aspect ratio - this->aspect_ratio = mlt_properties_get_double( this->properties, "aspect_ratio" ); - - // Default display aspect ratio - this->display_aspect = 4.0 / 3.0; + // Ensure we don't join on a non-running object + this->joined = 1; // 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 + 0.5; - 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; } // Set the sdl flags @@ -158,6 +141,9 @@ mlt_consumer consumer_sdl_init( char *arg ) parent->stop = consumer_stop; parent->is_stopped = consumer_is_stopped; + // Register specific events + mlt_events_register( this->properties, "consumer-sdl-event", ( mlt_transmitter )consumer_sdl_event ); + // Return the consumer produced return parent; } @@ -169,28 +155,88 @@ mlt_consumer consumer_sdl_init( char *arg ) return NULL; } +static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt_service this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( SDL_Event * )args[ 0 ] ); +} + int consumer_start( mlt_consumer parent ) { consumer_sdl this = parent->child; if ( !this->running ) { - pthread_attr_t thread_attributes; - + 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; - // Allow the user to force resizing to window size - if ( mlt_properties_get_int( this->properties, "resize" ) ) + 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" ); + + // Attach a colour space converter + if ( preview_off && !this->filtered ) { - mlt_properties_set_int( this->properties, "width", this->width ); - mlt_properties_set_int( this->properties, "height", this->height ); + mlt_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) ); + mlt_filter filter = mlt_factory_filter( profile, "avcolour_space", NULL ); + if ( filter ) + { + mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "forced", mlt_image_yuv422 ); + mlt_service_attach( MLT_CONSUMER_SERVICE( parent ), filter ); + mlt_filter_close( filter ); + } + this->filtered = 1; } - - // 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 ); + if ( sdl_started == 0 && display_off == 0 ) + { + 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 if ( display_off == 0 ) + { + this->sdl_screen = SDL_GetVideoSurface( ); + } + + if ( audio_off == 0 ) + SDL_InitSubSystem( SDL_INIT_AUDIO ); + + // Default window size + double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); + this->window_width = ( double )this->height * display_ratio; + 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 = SDL_GetVideoInfo(); + this->window_width = vi->current_w; + this->window_height = vi->current_h; + this->sdl_flags |= SDL_FULLSCREEN; + SDL_ShowCursor( SDL_DISABLE ); + } + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + } + + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -201,16 +247,31 @@ int consumer_stop( mlt_consumer parent ) // Get the actual object consumer_sdl this = parent->child; - if ( this->running ) + if ( this->joined == 0 ) { // Kill the thread and clean up + this->joined = 1; this->running = 0; + if ( this->thread ) + 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; + + 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 ); + } - pthread_join( this->thread, NULL ); + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + SDL_Quit( ); + + this->sdl_screen = NULL; } return 0; @@ -240,7 +301,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 ); @@ -251,7 +312,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; @@ -264,11 +328,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; @@ -318,7 +379,7 @@ 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.format = AUDIO_S16SYS; request.channels = channels; request.samples = audio_buffer; request.callback = sdl_fill_audio; @@ -337,7 +398,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 ) ) @@ -371,20 +432,31 @@ 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_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 ); // Handle events if ( this->sdl_screen != NULL ) { SDL_Event event; + sdl_lock_display( ); changed = consumer_get_dimensions( &this->window_width, &this->window_height ); - + sdl_unlock_display( ); + while ( SDL_PollEvent( &event ) ) { + mlt_events_fire( this->properties, "consumer-sdl-event", &event, NULL ); + switch( event.type ) { case SDL_VIDEORESIZE: @@ -411,100 +483,100 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( width != this->width || height != this->height || this->last_frame_aspect != mlt_frame_get_aspect_ratio( frame ) ) + 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 && ( 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 + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, this->bpp, this->sdl_flags ); + 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 ); + + 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 ) { - // 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 + 0.5; - } + 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 + 0.5; + this->rect.h = this->window_width / display_ratio; } else { - this->rect.w = this->window_height * this->display_aspect + 0.5; + 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; - - // Force an overlay recreation - if ( this->sdl_overlay != NULL ) - SDL_FreeYUVOverlay( this->sdl_overlay ); + this->rect.x -= this->rect.x % 2; - // 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(); + 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 ); - 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_unlock_display(); - mlt_properties_set_int( properties, "changed", 0 ); + this->sdl_overlay = SDL_CreateYUVOverlay( width, height, SDL_YUY2_OVERLAY, this->sdl_screen ); } - 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(); if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { if ( image != NULL ) @@ -512,8 +584,17 @@ 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(); + } + 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; @@ -533,6 +614,9 @@ static void *video_thread( void *arg ) mlt_properties properties = NULL; double speed = 0; + // Get real time flag + int real_time = mlt_properties_get_int( this->properties, "real_time" ); + // Get the current time gettimeofday( &now, NULL ); @@ -543,12 +627,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" ); @@ -563,13 +653,13 @@ 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 ( difference > 20000 && speed == 1.0 ) + if ( real_time && ( difference > 20000 && speed == 1.0 ) ) { tm.tv_sec = difference / 1000000; tm.tv_nsec = ( difference % 1000000 ) * 500; @@ -577,11 +667,11 @@ static void *video_thread( void *arg ) } // Show current frame if not too old - if ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) + if ( !real_time || ( difference > -10000 || speed != 1.0 || mlt_deque_count( this->queue ) < 2 ) ) consumer_play_video( this, next ); // If the queue is empty, recalculate start to allow build up again - if ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) + if ( real_time && ( mlt_deque_count( this->queue ) == 0 && speed == 1.0 ) ) { gettimeofday( &now, NULL ); start = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - scheduled + 20000; @@ -590,8 +680,14 @@ 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 ); + return NULL; } @@ -606,6 +702,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; @@ -618,26 +718,21 @@ 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 ) - { - 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 ); - // 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 ) { // 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 ); @@ -653,7 +748,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 ); @@ -669,6 +764,8 @@ static void *consumer_thread( void *arg ) } } + this->running = 0; + // Kill the video thread if ( init_video == 0 ) { @@ -678,16 +775,10 @@ static void *consumer_thread( void *arg ) pthread_join( thread, NULL ); } - // internal cleanup - if ( this->sdl_overlay != NULL ) - SDL_FreeYUVOverlay( this->sdl_overlay ); - 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; @@ -704,8 +795,9 @@ 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 ) { @@ -730,9 +822,10 @@ static int consumer_get_dimensions( int *width, int *height ) *height = attr.height; } } +#endif // Unlock the display - sdl_lock_display(); + //sdl_unlock_display(); return changed; } @@ -746,7 +839,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 ); @@ -755,9 +851,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 ); }