X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_preview.c;h=479774e23631dcecf0b7a09aa9428c9349dcc1b4;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=f1a7c5051da7d26023e3284efedc79620d20b58f;hpb=acb9c0fc046106064717dd5bdba9b7a2d7057c32;p=melted diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c index f1a7c50..479774e 100644 --- a/src/modules/sdl/consumer_sdl_preview.c +++ b/src/modules/sdl/consumer_sdl_preview.c @@ -3,19 +3,19 @@ * Copyright (C) 2004-2005 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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" @@ -135,19 +135,84 @@ static int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - + // properties + mlt_properties properties = MLT_CONSUMER_PROPERTIES( parent ); + mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play ); + mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still ); + + 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" ); + char *output_display = mlt_properties_get( properties, "output_display" ); + int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" ); + consumer_stop( parent ); this->running = 1; this->joined = 0; this->last_speed = 1; - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + 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 ( 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 ); + + // Pass properties down + mlt_properties_set_data( play, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( still, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL ); + + mlt_properties_set_int( play, "progressive", progressive ); + mlt_properties_set_int( still, "progressive", progressive ); + + mlt_properties_pass_list( play, properties, "resize,rescale,width,height,aspect_ratio,display_ratio,volume" ); + mlt_properties_pass_list( still, properties, "resize,rescale,width,height,aspect_ratio,display_ratio" ); + mlt_properties_pass_list( play, properties, "deinterlace_method" ); + mlt_properties_pass_list( still, properties, "deinterlace_method" ); + mlt_properties_pass_list( play, properties, "preview_off,preview_format" ); + mlt_properties_pass_list( still, properties, "preview_off,preview_format" ); + + mlt_properties_pass( play, properties, "play." ); + mlt_properties_pass( still, properties, "still." ); + + mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL ); + mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL ); + + mlt_properties_set_int( play, "put_mode", 1 ); + mlt_properties_set_int( still, "put_mode", 1 ); + + // Start the still producer just to initialise the gui + mlt_consumer_start( this->still ); + this->active = this->still; + + // Inform child consumers that we control the sdl + mlt_properties_set_int( play, "sdl_started", 1 ); + mlt_properties_set_int( still, "sdl_started", 1 ); - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -174,13 +239,12 @@ static int consumer_stop( mlt_consumer parent ) pthread_cond_broadcast( &this->refresh_cond ); pthread_mutex_unlock( &this->refresh_mutex ); - if ( this->play ) mlt_consumer_stop( this->play ); - if ( this->still ) mlt_consumer_stop( this->still ); - pthread_join( this->thread, NULL ); this->joined = 1; if ( app_locked && lock ) lock( ); + + SDL_Quit( ); } return 0; @@ -200,56 +264,18 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; + // Get the properties + mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); + // internal intialization int first = 1; mlt_frame frame = NULL; int last_position = -1; - // properties - mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); - mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play ); - mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still ); + // Determine if the application is dealing with the preview + int preview_off = mlt_properties_get_int( properties, "preview_off" ); - 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 ); - - // Inform child consumers that we control the sdl - mlt_properties_set_int( play, "sdl_started", 1 ); - mlt_properties_set_int( still, "sdl_started", 1 ); - - // Pass properties down - mlt_properties_set_data( play, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( still, "transport_producer", mlt_properties_get_data( properties, "transport_producer", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( play, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( still, "transport_callback", mlt_properties_get_data( properties, "transport_callback", NULL ), 0, NULL, NULL ); - mlt_properties_set_int( play, "resize", mlt_properties_get_int( properties, "resize" ) ); - mlt_properties_set_int( still, "resize", mlt_properties_get_int( properties, "resize" ) ); - mlt_properties_set( play, "rescale", mlt_properties_get( properties, "rescale" ) ); - mlt_properties_set( still, "rescale", mlt_properties_get( properties, "rescale" ) ); - mlt_properties_set_int( play, "width", mlt_properties_get_int( properties, "width" ) ); - mlt_properties_set_int( still, "width", mlt_properties_get_int( properties, "width" ) ); - mlt_properties_set_int( play, "height", mlt_properties_get_int( properties, "height" ) ); - mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) ); - - mlt_properties_set_int( play, "progressive", 1 ); - mlt_properties_set_int( still, "progressive", 1 ); - - mlt_properties_pass( play, MLT_CONSUMER_PROPERTIES( consumer ), "play." ); - mlt_properties_pass( still, MLT_CONSUMER_PROPERTIES( consumer ), "still." ); - - mlt_properties_set_data( play, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( still, "app_lock", mlt_properties_get_data( properties, "app_lock", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( play, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL ); - mlt_properties_set_data( still, "app_unlock", mlt_properties_get_data( properties, "app_unlock", NULL ), 0, NULL, NULL ); - - mlt_properties_set_int( play, "put_mode", 1 ); - mlt_properties_set_int( still, "put_mode", 1 ); + this->refresh_count = 0; // Loop until told not to while( this->running ) @@ -258,14 +284,11 @@ static void *consumer_thread( void *arg ) frame = mlt_consumer_get_frame( consumer ); // Ensure that we have a frame - if ( frame != NULL ) + if ( this->running && frame != NULL ) { // Get the speed of the frame double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" ); - // Determine which speed to use - double use_speed = speed; - // Lock during the operation mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) ); @@ -295,7 +318,7 @@ static void *consumer_thread( void *arg ) } else { - mlt_consumer_purge( this->play ); + //mlt_consumer_purge( this->play ); last_position = -1; } @@ -311,13 +334,13 @@ static void *consumer_thread( void *arg ) mlt_consumer_put_frame( this->active, frame ); } // If we aren't playing normally, then use the still - else if ( use_speed != 1 ) + else if ( speed != 1 ) { if ( !mlt_consumer_is_stopped( this->play ) ) mlt_consumer_stop( this->play ); if ( mlt_consumer_is_stopped( this->still ) ) { - this->last_speed = use_speed; + this->last_speed = speed; this->active = this->still; this->ignore_change = 0; mlt_consumer_start( this->still ); @@ -331,7 +354,7 @@ static void *consumer_thread( void *arg ) mlt_consumer_stop( this->still ); if ( mlt_consumer_is_stopped( this->play ) ) { - this->last_speed = use_speed; + this->last_speed = speed; this->active = this->play; this->ignore_change = 25; mlt_consumer_start( this->play ); @@ -340,7 +363,7 @@ static void *consumer_thread( void *arg ) } // Copy the rectangle info from the active consumer - if ( this->running ) + if ( this->running && preview_off == 0 ) { mlt_properties active = MLT_CONSUMER_PROPERTIES( this->active ); mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) ); @@ -354,21 +377,25 @@ static void *consumer_thread( void *arg ) if ( this->active == this->still ) { pthread_mutex_lock( &this->refresh_mutex ); - if ( speed == 0 && this->refresh_count == 0 ) + if ( this->running && speed == 0 && this->refresh_count <= 0 ) pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex ); - this->refresh_count = 0; + this->refresh_count --; pthread_mutex_unlock( &this->refresh_mutex ); } // We are definitely not waiting on the first frame any more first = 0; } + else + { + if ( frame ) mlt_frame_close( frame ); + mlt_consumer_put_frame( this->active, NULL ); + this->running = 0; + } } - mlt_consumer_stop( this->play ); - mlt_consumer_stop( this->still ); - - SDL_Quit( ); + if ( this->play ) mlt_consumer_stop( this->play ); + if ( this->still ) mlt_consumer_stop( this->still ); return NULL; } @@ -384,13 +411,13 @@ static void consumer_close( mlt_consumer parent ) // Stop the consumer mlt_consumer_stop( parent ); - // Now clean up the rest - mlt_consumer_close( parent ); - // Close the child consumers mlt_consumer_close( this->play ); mlt_consumer_close( this->still ); + // Now clean up the rest + mlt_consumer_close( parent ); + // Finally clean up this free( this ); }