X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl.c;h=91925c91c6b2670ed1526ab72c6787352a7079b8;hb=f57f631e220282142e35b48c59559051d36a39cb;hp=aac59c887db54491e8b199b8bc319f27e0a4c0ab;hpb=11410cf74f5de6c8f4460a8b12119fa5558153a1;p=melted diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c index aac59c8..91925c9 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. */ @@ -40,15 +47,19 @@ struct consumer_sdl_s mlt_properties properties; mlt_deque queue; pthread_t thread; + int joined; int running; - uint8_t audio_buffer[ 4096 * 19 ]; + uint8_t audio_buffer[ 4096 * 10 ]; int audio_avail; pthread_mutex_t audio_mutex; pthread_cond_t audio_cond; + pthread_mutex_t video_mutex; + pthread_cond_t video_cond; int window_width; int window_height; float aspect_ratio; float display_aspect; + double last_frame_aspect; int width; int height; int playing; @@ -57,6 +68,7 @@ struct consumer_sdl_s SDL_Overlay *sdl_overlay; SDL_Rect rect; uint8_t *buffer; + int bpp; }; /** Forward references to static functions. @@ -68,6 +80,7 @@ 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. @@ -75,6 +88,16 @@ static int consumer_get_dimensions( int *width, int *height ); 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 ); @@ -91,8 +114,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 ); @@ -100,6 +123,8 @@ mlt_consumer consumer_sdl_init( char *arg ) // This is the initialisation of the consumer pthread_mutex_init( &this->audio_mutex, NULL ); pthread_cond_init( &this->audio_cond, NULL); + pthread_mutex_init( &this->video_mutex, NULL ); + pthread_cond_init( &this->video_cond, NULL); // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); @@ -111,10 +136,13 @@ 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" ); + + // Ensure we don't join on a non-running object + this->joined = 1; // Default display aspect ratio this->display_aspect = 4.0 / 3.0; @@ -124,27 +152,12 @@ mlt_consumer consumer_sdl_init( char *arg ) { 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; } + // 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; @@ -153,6 +166,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; } @@ -164,15 +180,22 @@ 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; - + 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" ) ) @@ -181,11 +204,7 @@ int consumer_start( mlt_consumer parent ) mlt_properties_set_int( this->properties, "height", this->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; @@ -196,15 +215,11 @@ 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; - - pthread_mutex_lock( &this->audio_mutex ); - pthread_cond_broadcast( &this->audio_cond ); - pthread_mutex_unlock( &this->audio_mutex ); - pthread_join( this->thread, NULL ); } @@ -332,16 +347,19 @@ 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 ( bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) + while ( this->running && bytes > ( sizeof( this->audio_buffer) - this->audio_avail ) ) pthread_cond_wait( &this->audio_cond, &this->audio_mutex ); - if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) - memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); - else - memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); - this->audio_avail += bytes; + if ( this->running ) + { + if ( mlt_properties_get_double( properties, "_speed" ) == 1 ) + memcpy( &this->audio_buffer[ this->audio_avail ], pcm, bytes ); + else + memset( &this->audio_buffer[ this->audio_avail ], 0, bytes ); + this->audio_avail += bytes; + } pthread_cond_broadcast( &this->audio_cond ); pthread_mutex_unlock( &this->audio_mutex ); } @@ -363,9 +381,10 @@ 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 ); mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); // Handle events @@ -374,9 +393,11 @@ 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 ); + switch( event.type ) { case SDL_VIDEORESIZE: @@ -405,19 +426,46 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( width != this->width || height != this->height ) { - this->width = width; - this->height = height; - 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; + // Determine frame's display aspect ratio + float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height; + this->width = width; + this->height = height; + // If using hardware scaler if ( mlt_properties_get( properties, "rescale" ) != NULL && !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) ) @@ -433,12 +481,12 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) else { // Use hardware scaler to normalise display aspect ratio - this->rect.w = frame_aspect / this_aspect * this->window_width + 0.5; + 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; } } } @@ -450,49 +498,41 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) this->rect.h = this->window_height; } // Use hardware scaler to normalise sample aspect ratio - else if ( this->window_height * frame_aspect > this->window_width ) + else if ( this->window_height * this->display_aspect > this->window_width ) { this->rect.w = this->window_width; - this->rect.h = this->window_width / frame_aspect + 0.5; + this->rect.h = this->window_width / this->display_aspect; } else { - this->rect.w = this->window_height * frame_aspect + 0.5; + this->rect.w = this->window_height * this->display_aspect; 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 ); - // open SDL window with video overlay, if possible - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + 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_lock_display(); + this->sdl_overlay = SDL_CreateYUVOverlay( this->width, this->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(); if ( SDL_LockYUVOverlay( this->sdl_overlay ) >= 0 ) { if ( image != NULL ) @@ -500,13 +540,112 @@ 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(); } - } return 0; } +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; + int64_t elapsed = 0; + struct timespec tm; + mlt_frame next = NULL; + 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 ); + + // Determine start time + start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + + while ( this->running ) + { + // Pop the next frame + pthread_mutex_lock( &this->video_mutex ); + 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 ); + + // Get the speed of the frame + speed = mlt_properties_get_double( properties, "_speed" ); + + // Get the current time + gettimeofday( &now, NULL ); + + // Get the elapsed time + elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - start; + + // See if we have to delay the display of the current frame + if ( mlt_properties_get_int( properties, "rendered" ) == 1 && this->running ) + { + // Obtain the scheduled playout time + mlt_position scheduled = mlt_properties_get_position( properties, "playtime" ); + + // Determine the difference between the elapsed time and the scheduled playout time + mlt_position difference = scheduled - elapsed; + + // Smooth playback a bit + if ( real_time && ( difference > 20000 && speed == 1.0 ) ) + { + tm.tv_sec = difference / 1000000; + tm.tv_nsec = ( difference % 1000000 ) * 500; + nanosleep( &tm, NULL ); + } + + // Show current frame if not too old + 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 ( 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; + } + } + + // 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; +} + /** Threaded wrapper for pipe. */ @@ -515,31 +654,50 @@ 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; + // Video thread + pthread_t thread; + // internal intialization int init_audio = 1; - - // Obtain time of thread start - struct timeval now; - int64_t start = 0; - int64_t elapsed = 0; - int duration = 0; - int64_t playtime = 0; - struct timespec tm; - mlt_frame next = NULL; + int init_video = 1; mlt_frame frame = NULL; mlt_properties properties = NULL; + int duration = 0; + int64_t playtime = 0; + struct timespec tm = { 0, 100000 }; + + this->bpp = mlt_properties_get_int( this->properties, "bpp" ); - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_NOPARACHUTE ) < 0 ) + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) { - fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); - return NULL; + 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 ); + } } - 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 ) @@ -551,90 +709,56 @@ 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 ); // Determine the start time now - if ( this->playing && start == 0 ) + if ( this->playing && init_video ) { - // Get the current time - gettimeofday( &now, NULL ); + // Create the video thread + pthread_create( &thread, NULL, video_thread, this ); - // Determine start time - start = ( int64_t )now.tv_sec * 1000000 + now.tv_usec; + // Video doesn't need to be initialised any more + init_video = 0; } // Set playtime for this frame mlt_properties_set_position( properties, "playtime", playtime ); + while ( this->running && mlt_deque_count( this->queue ) > 15 ) + nanosleep( &tm, NULL ); + // Push this frame to the back of the queue + pthread_mutex_lock( &this->video_mutex ); mlt_deque_push_back( this->queue, frame ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); // Calculate the next playtime playtime += ( duration * 1000 ); } + } - // Pop the next frame - next = mlt_deque_pop_front( this->queue ); - - while ( next != NULL && this->playing ) - { - // Get the properties - properties = mlt_frame_properties( next ); - - // Get the current time - gettimeofday( &now, NULL ); - - // Get the elapsed time - elapsed = ( ( int64_t )now.tv_sec * 1000000 + now.tv_usec ) - start; - - // See if we have to delay the display of the current frame - if ( mlt_properties_get_int( properties, "rendered" ) == 1 ) - { - // Obtain the scheduled playout time - mlt_position scheduled = mlt_properties_get_position( properties, "playtime" ); - - // Determine the difference between the elapsed time and the scheduled playout time - mlt_position difference = scheduled - elapsed; - - // If the frame is quite some way in the future, go get another - if ( difference >= 30000 && mlt_deque_count( this->queue ) < 10 ) - break; - - // Smooth playback a bit - if ( difference > 20000 && mlt_properties_get_double( properties, "_speed" ) == 1.0 ) - { - tm.tv_sec = difference / 1000000; - tm.tv_nsec = ( difference % 1000000 ) * 1000; - nanosleep( &tm, NULL ); - } - - // Show current frame if not too old - if ( difference > -10000 || mlt_properties_get_double( properties, "_speed" ) != 1.0 ) - consumer_play_video( this, next ); - else - start = start - difference; - } - - // This is an unrendered frame - just close it - mlt_frame_close( next ); - - // Pop the next frame - next = mlt_deque_pop_front( this->queue ); - } - - if ( next != NULL ) - mlt_deque_push_front( this->queue, next ); + // Kill the video thread + if ( init_video == 0 ) + { + pthread_mutex_lock( &this->video_mutex ); + pthread_cond_broadcast( &this->video_cond ); + pthread_mutex_unlock( &this->video_mutex ); + pthread_join( thread, NULL ); } // internal cleanup - if ( init_audio == 0 ) - SDL_AudioQuit( ); 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 ) ); @@ -643,6 +767,10 @@ static void *consumer_thread( void *arg ) this->sdl_overlay = NULL; this->audio_avail = 0; +#ifdef __DARWIN__ + [pool release]; +#endif + return NULL; } @@ -656,6 +784,10 @@ static int consumer_get_dimensions( int *width, int *height ) // Specify the SDL Version SDL_VERSION( &wm.version ); + // Lock the display + sdl_lock_display(); + +#ifndef __DARWIN__ // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { @@ -680,6 +812,10 @@ static int consumer_get_dimensions( int *width, int *height ) *height = attr.height; } } +#endif + + // Unlock the display + sdl_lock_display(); return changed; } @@ -693,7 +829,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 ); @@ -702,9 +841,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 ); }