X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=efddb29273921246c3307c30bdaea8acbaef30b8;hb=0f587b2;hp=7653c954b463f10aad289bc934a945f229d51fa3;hpb=8fe01bdf269a5ef0e7afdeccaf8598f5f4c0530e;p=mlt diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 7653c954..efddb292 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -1,6 +1,6 @@ /* * consumer_sdl_still.c -- A Simple DirectMedia Layer consumer - * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Copyright (C) 2003-2004, 2010 Ushodaya Enterprises Limited * Author: Charles Yates * * This library is free software; you can redistribute it and/or @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include "consumer_sdl_osx.h" @@ -53,7 +53,6 @@ struct consumer_sdl_s int height; int playing; int sdl_flags; - SDL_Surface *sdl_screen; SDL_Rect rect; uint8_t *buffer; int last_position; @@ -78,7 +77,7 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt mlt_consumer consumer_sdl_still_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, profile ) == 0 ) @@ -163,12 +162,15 @@ static int consumer_start( mlt_consumer parent ) // Default window size double display_ratio = mlt_properties_get_double( this->properties, "display_ratio" ); - this->window_width = ( double )this->height * display_ratio; + this->window_width = ( double )this->height * display_ratio + 0.5; this->window_height = this->height; if ( sdl_started == 0 && preview_off == 0 ) { - if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) + 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 ) { fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); return -1; @@ -177,20 +179,11 @@ static int consumer_start( mlt_consumer parent ) SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); SDL_EnableUNICODE( 1 ); } - else if ( preview_off == 0 ) - { - if ( SDL_GetVideoSurface( ) != NULL ) - { - this->sdl_screen = SDL_GetVideoSurface( ); - } - } - if ( this->sdl_screen == NULL && preview_off == 0 ) - { - pthread_mutex_lock( &mlt_sdl_mutex ); - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); - pthread_mutex_unlock( &mlt_sdl_mutex ); - } + pthread_mutex_lock( &mlt_sdl_mutex ); + if ( !SDL_GetVideoSurface() && preview_off == 0 ) + 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 ); } @@ -220,8 +213,6 @@ static int consumer_stop( mlt_consumer parent ) SDL_Quit( ); pthread_mutex_unlock( &mlt_sdl_mutex ); } - - this->sdl_screen = NULL; } return 0; @@ -395,7 +386,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) sdl_lock_display(); // Handle events - if ( this->sdl_screen != NULL ) + if ( SDL_GetVideoSurface() ) { SDL_Event event; @@ -433,18 +424,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( this->sdl_screen == NULL || changed ) + if ( !SDL_GetVideoSurface() || changed ) { // open SDL window pthread_mutex_lock( &mlt_sdl_mutex ); - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); - 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 ); + consumer_get_dimensions( &this->window_width, &this->window_height ); + SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); - uint32_t color = mlt_properties_get_int( this->properties, "window_background" ); - if ( this->sdl_screen ) + if ( screen ) { - SDL_FillRect( this->sdl_screen, NULL, color >> 8 ); + uint32_t color = mlt_properties_get_int( this->properties, "window_background" ); + SDL_FillRect( screen, NULL, color >> 8 ); changed = 1; } pthread_mutex_unlock( &mlt_sdl_mutex ); @@ -505,32 +495,33 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) mlt_properties_set_int( this->properties, "rect_h", this->rect.h ); } - if ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL ) + pthread_mutex_lock( &mlt_sdl_mutex ); + SDL_Surface *screen = SDL_GetVideoSurface( ); + if ( !mlt_consumer_is_stopped( &this->parent ) && screen && screen->pixels ) { - switch( this->sdl_screen->format->BytesPerPixel ) + switch( screen->format->BytesPerPixel ) { case 1: - display_1( this->sdl_screen, this->rect, image, width, height ); + display_1( screen, this->rect, image, width, height ); break; case 2: - display_2( this->sdl_screen, this->rect, image, width, height ); + display_2( screen, this->rect, image, width, height ); break; case 3: - display_3( this->sdl_screen, this->rect, image, width, height ); + display_3( screen, this->rect, image, width, height ); break; case 4: - display_4( this->sdl_screen, this->rect, image, width, height ); + display_4( screen, this->rect, image, width, height ); break; default: - fprintf( stderr, "Unsupported video depth %d\n", this->sdl_screen->format->BytesPerPixel ); + fprintf( stderr, "Unsupported video depth %d\n", screen->format->BytesPerPixel ); break; } // Flip it into sight - pthread_mutex_lock( &mlt_sdl_mutex ); - SDL_Flip( this->sdl_screen ); - pthread_mutex_unlock( &mlt_sdl_mutex ); + SDL_Flip( screen ); } + pthread_mutex_unlock( &mlt_sdl_mutex ); sdl_unlock_display(); mlt_cocoa_autorelease_close( pool ); @@ -607,10 +598,11 @@ static int consumer_get_dimensions( int *width, int *height ) // Specify the SDL Version SDL_VERSION( &wm.version ); +#ifndef __DARWIN__ // Get the wm structure if ( SDL_GetWMInfo( &wm ) == 1 ) { -#ifndef __DARWIN__ +#ifndef WIN32 // Check that we have the X11 wm if ( wm.subsystem == SDL_SYSWM_X11 ) { @@ -633,6 +625,7 @@ static int consumer_get_dimensions( int *width, int *height ) } #endif } +#endif return changed; }