X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=ad83aa4567a8dd100cbec7545f9d8e0168140059;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=cdc2b0f5a853e9601affae5b48970dfd8587e6a1;hpb=e727806e894128be3004502eee4d41537fb31c7d;p=melted diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index cdc2b0f..ad83aa4 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -45,9 +45,6 @@ struct consumer_sdl_s int running; int window_width; int window_height; - float aspect_ratio; - float display_aspect; - double last_frame_aspect; int width; int height; int playing; @@ -57,6 +54,7 @@ struct consumer_sdl_s uint8_t *buffer; int last_position; mlt_producer last_producer; + int filtered; }; /** Forward references to static functions. @@ -85,19 +83,16 @@ mlt_consumer consumer_sdl_still_init( char *arg ) // Get the parent consumer object mlt_consumer parent = &this->parent; - // Attach a colour space converter - mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL ); - mlt_properties_set_int( mlt_filter_properties( filter ), "forced", mlt_image_yuv422 ); - mlt_service_attach( mlt_consumer_service( &this->parent ), filter ); - mlt_filter_close( filter ); + // get a handle on properties + mlt_service service = MLT_CONSUMER_SERVICE( parent ); + this->properties = MLT_SERVICE_PROPERTIES( service ); + + // Get the default display ratio + double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); // We have stuff to clean up, so override the close method parent->close = consumer_close; - // get a handle on properties - mlt_service service = mlt_consumer_service( parent ); - this->properties = mlt_service_properties( service ); - // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); @@ -107,15 +102,9 @@ mlt_consumer consumer_sdl_still_init( char *arg ) // Default progressive true mlt_properties_set_int( this->properties, "progressive", 1 ); - // 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; - // process actual param if ( arg == NULL || sscanf( arg, "%dx%d", &this->width, &this->height ) != 2 ) { @@ -124,11 +113,13 @@ mlt_consumer consumer_sdl_still_init( char *arg ) } // Default window size - this->window_width = ( float )this->height * this->display_aspect; + 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_RESIZABLE | SDL_DOUBLEBUF; + // Experimental settings + this->sdl_flags = SDL_RESIZABLE | SDL_DOUBLEBUF; // Allow thread to be started/stopped parent->start = consumer_start; @@ -161,8 +152,16 @@ static int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - + // Attach a colour space converter + if ( !this->filtered ) + { + mlt_filter filter = mlt_factory_filter( "avcolour_space", NULL ); + 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; + } + consumer_stop( parent ); this->last_position = -1; @@ -176,13 +175,29 @@ static int consumer_start( mlt_consumer parent ) mlt_properties_set_int( this->properties, "height", this->height ); } - //this->width = this->height * this->display_aspect; + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + { + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) + { + fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); + return -1; + } - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); + SDL_EnableUNICODE( 1 ); + } + else + { + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 2 ); + if ( SDL_GetVideoSurface( ) != NULL ) + { + this->sdl_screen = SDL_GetVideoSurface( ); + consumer_get_dimensions( &this->window_width, &this->window_height ); + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "changed", 0 ); + } + } - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -200,6 +215,11 @@ static int consumer_stop( mlt_consumer parent ) pthread_join( this->thread, NULL ); this->joined = 1; + + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 ) + SDL_Quit( ); + + this->sdl_screen = NULL; } return 0; @@ -354,6 +374,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) int width = this->width; uint8_t *image = NULL; int changed = 0; + double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); void ( *lock )( void ) = mlt_properties_get_data( properties, "app_lock", NULL ); void ( *unlock )( void ) = mlt_properties_get_data( properties, "app_unlock", NULL ); @@ -411,14 +432,13 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } else { - changed = mlt_properties_get_int( properties, "changed" ) | mlt_properties_get_int( mlt_frame_properties( frame ), "refresh" ); + changed = 1; mlt_properties_set_int( properties, "changed", 0 ); } - if ( changed == 0 && this->last_position == mlt_frame_get_position( frame ) && - this->last_producer == mlt_properties_get_data( mlt_frame_properties( frame ), "_producer", NULL ) ) + this->last_producer == mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ) ) { sdl_unlock_display( ); if ( unlock != NULL ) @@ -428,30 +448,18 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) // Update last frame shown info this->last_position = mlt_frame_get_position( frame ); - this->last_producer = mlt_properties_get_data( mlt_frame_properties( frame ), "_producer", NULL ); + this->last_producer = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ); // Get the image, width and height - if ( image == NULL ) - { - mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); - - // I would like to provide upstream scaling here, but this is incorrect - // Something? (or everything?) is too sensitive to aspect ratio - //width = this->rect.w; - //height = this->rect.h; - //mlt_properties_set( mlt_frame_properties( frame ), "distort", "true" ); - //mlt_properties_set_int( mlt_frame_properties( frame ), "normalised_width", width ); - //mlt_properties_set_int( mlt_frame_properties( frame ), "normalised_height", height ); + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - } - - if ( 1 ) + if ( image != NULL ) { char *rescale = mlt_properties_get( properties, "rescale" ); if ( rescale != NULL && strcmp( rescale, "none" ) ) { - float this_aspect = this->display_aspect / ( ( float )this->window_width / ( float )this->window_height ); + double this_aspect = display_ratio / ( ( double )this->window_width / ( double )this->window_height ); this->rect.w = this_aspect * this->window_width; this->rect.h = this->window_height; if ( this->rect.w > this->window_width ) @@ -462,7 +470,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } else { - float frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height; + double frame_aspect = mlt_frame_get_aspect_ratio( frame ) * width / height; this->rect.w = frame_aspect * this->window_height; this->rect.h = this->window_height; if ( this->rect.w > this->window_width ) @@ -481,7 +489,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) mlt_properties_set_int( this->properties, "rect_h", this->rect.h ); } - if ( this->sdl_screen != NULL ) + if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL ) { memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel ); @@ -512,7 +520,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( unlock != NULL ) unlock( ); - return 0; + return 1; } /** Threaded wrapper for pipe. @@ -528,29 +536,6 @@ static void *consumer_thread( void *arg ) // internal intialization mlt_frame frame = NULL; - struct timespec tm = { 0, 1000 }; - - 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 - { - mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 2 ); - if ( SDL_GetVideoSurface( ) != NULL ) - { - this->sdl_screen = SDL_GetVideoSurface( ); - consumer_get_dimensions( &this->window_width, &this->window_height ); - mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 0 ); - } - } // Loop until told not to while( this->running ) @@ -559,19 +544,18 @@ static void *consumer_thread( void *arg ) frame = mlt_consumer_rt_frame( consumer ); // Ensure that we have a frame - if ( frame != NULL ) + if ( this->running && frame != NULL ) { consumer_play_video( this, frame ); mlt_frame_close( frame ); - nanosleep( &tm, NULL ); + } + else + { + if ( frame ) mlt_frame_close( frame ); + this->running = 0; } } - if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 ) - SDL_Quit( ); - - this->sdl_screen = NULL; - return NULL; } @@ -588,6 +572,7 @@ static int consumer_get_dimensions( int *width, int *height ) // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { +#ifndef __DARWIN__ // Check that we have the X11 wm if ( wm.subsystem == SDL_SYSWM_X11 ) { @@ -608,6 +593,7 @@ static int consumer_get_dimensions( int *width, int *height ) *width = attr.width; *height = attr.height; } +#endif } return changed;