X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=efddb29273921246c3307c30bdaea8acbaef30b8;hb=0f587b2;hp=6ee1e94bb400e5805caf8566146d951f41f0e730;hpb=eccf04749681f70957f34fdd6742224774e72d15;p=mlt diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 6ee1e94b..efddb292 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -1,35 +1,39 @@ /* * 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 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 #include #include -#include -#include +#include +#include #include +#include "consumer_sdl_osx.h" + +extern pthread_mutex_t mlt_sdl_mutex; /** This classes definition. */ @@ -49,12 +53,10 @@ struct consumer_sdl_s int height; int playing; int sdl_flags; - SDL_Surface *sdl_screen; SDL_Rect rect; uint8_t *buffer; int last_position; mlt_producer last_producer; - int filtered; }; /** Forward references to static functions. @@ -72,13 +74,13 @@ static void consumer_sdl_event( mlt_listener listener, mlt_properties owner, mlt via the argument, but keep it simple. */ -mlt_consumer consumer_sdl_still_init( char *arg ) +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 ) == 0 ) + if ( this != NULL && mlt_consumer_init( &this->parent, this, profile ) == 0 ) { // Get the parent consumer object mlt_consumer parent = &this->parent; @@ -87,9 +89,6 @@ mlt_consumer consumer_sdl_still_init( char *arg ) 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; @@ -99,9 +98,6 @@ mlt_consumer consumer_sdl_still_init( char *arg ) // We're always going to run this in non-realtime mode mlt_properties_set( this->properties, "real_time", "0" ); - // Default progressive true - mlt_properties_set_int( this->properties, "progressive", 1 ); - // Ensure we don't join on a non-running object this->joined = 1; @@ -117,10 +113,6 @@ mlt_consumer consumer_sdl_still_init( char *arg ) mlt_properties_set_int( this->properties, "height", this->height ); } - // Default window size - 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; @@ -158,16 +150,6 @@ static int consumer_start( mlt_consumer parent ) int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" ); int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ); - // 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; @@ -178,9 +160,17 @@ static int consumer_start( mlt_consumer parent ) this->width = mlt_properties_get_int( this->properties, "width" ); this->height = mlt_properties_get_int( this->properties, "height" ); + // Default window size + double display_ratio = mlt_properties_get_double( this->properties, "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; @@ -189,17 +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( ); - consumer_get_dimensions( &this->window_width, &this->window_height ); - } - } - if ( this->sdl_screen == NULL && preview_off == 0 ) - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + 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 ); } @@ -216,7 +200,7 @@ static int consumer_stop( mlt_consumer parent ) { int preview_off = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "preview_off" ); int sdl_started = mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ); - + // Kill the thread and clean up this->running = 0; @@ -224,9 +208,11 @@ static int consumer_stop( mlt_consumer parent ) this->joined = 1; if ( sdl_started == 0 && preview_off == 0 ) + { + pthread_mutex_lock( &mlt_sdl_mutex ); SDL_Quit( ); - - this->sdl_screen = NULL; + pthread_mutex_unlock( &mlt_sdl_mutex ); + } } return 0; @@ -240,23 +226,29 @@ static int consumer_is_stopped( mlt_consumer parent ) static int sdl_lock_display( ) { + pthread_mutex_lock( &mlt_sdl_mutex ); SDL_Surface *screen = SDL_GetVideoSurface( ); - return screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 ); + int result = screen != NULL && ( !SDL_MUSTLOCK( screen ) || SDL_LockSurface( screen ) >= 0 ); + pthread_mutex_unlock( &mlt_sdl_mutex ); + return result; } static void sdl_unlock_display( ) { + pthread_mutex_lock( &mlt_sdl_mutex ); SDL_Surface *screen = SDL_GetVideoSurface( ); if ( screen != NULL && SDL_MUSTLOCK( screen ) ) SDL_UnlockSurface( screen ); + pthread_mutex_unlock( &mlt_sdl_mutex ); } static inline void display_1( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height ) { // Generate the affine transform scaling values + if ( rect.w == 0 || rect.h == 0 ) return; int scale_width = ( width << 16 ) / rect.w; int scale_height = ( height << 16 ) / rect.h; - int stride = width * 3; + int stride = width * 4; int x, y, row_index; uint8_t *q, *row; @@ -269,11 +261,11 @@ static inline void display_1( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 4 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -283,9 +275,10 @@ static inline void display_1( SDL_Surface *screen, SDL_Rect rect, uint8_t *image static inline void display_2( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height ) { // Generate the affine transform scaling values + if ( rect.w == 0 || rect.h == 0 ) return; int scale_width = ( width << 16 ) / rect.w; int scale_height = ( height << 16 ) / rect.h; - int stride = width * 3; + int stride = width * 4; int x, y, row_index; uint8_t *q, *row; @@ -298,11 +291,11 @@ static inline void display_2( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 4 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -312,9 +305,10 @@ static inline void display_2( SDL_Surface *screen, SDL_Rect rect, uint8_t *image static inline void display_3( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height ) { // Generate the affine transform scaling values + if ( rect.w == 0 || rect.h == 0 ) return; int scale_width = ( width << 16 ) / rect.w; int scale_height = ( height << 16 ) / rect.h; - int stride = width * 3; + int stride = width * 4; int x, y, row_index; uint8_t *q, *row; @@ -328,11 +322,11 @@ static inline void display_3( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 4 ); pixel = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); *p ++ = (pixel & 0xFF0000) >> 16; *p ++ = (pixel & 0x00FF00) >> 8; @@ -345,9 +339,10 @@ static inline void display_3( SDL_Surface *screen, SDL_Rect rect, uint8_t *image static inline void display_4( SDL_Surface *screen, SDL_Rect rect, uint8_t *image, int width, int height ) { // Generate the affine transform scaling values + if ( rect.w == 0 || rect.h == 0 ) return; int scale_width = ( width << 16 ) / rect.w; int scale_height = ( height << 16 ) / rect.h; - int stride = width * 3; + int stride = width * 4; int x, y, row_index; uint8_t *q, *row; @@ -360,11 +355,11 @@ static inline void display_4( SDL_Surface *screen, SDL_Rect rect, uint8_t *image for ( y = 0; y < rect.h; y ++ ) { p = start; - row_index = ( scale_height * y ) >> 16; + row_index = ( 32768 + scale_height * y ) >> 16; row = image + stride * row_index; for ( x = 0; x < rect.w; x ++ ) { - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 4 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -376,7 +371,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) // Get the properties of this consumer mlt_properties properties = this->properties; - mlt_image_format vfmt = mlt_image_rgb24; + mlt_image_format vfmt = mlt_image_rgb24a; int height = this->height; int width = this->width; uint8_t *image = NULL; @@ -387,15 +382,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) void ( *unlock )( void ) = mlt_properties_get_data( properties, "app_unlock", NULL ); if ( lock != NULL ) lock( ); - + void *pool = mlt_cocoa_autorelease_init(); sdl_lock_display(); // Handle events - if ( this->sdl_screen != NULL ) + if ( SDL_GetVideoSurface() ) { SDL_Event event; + pthread_mutex_lock( &mlt_sdl_mutex ); changed = consumer_get_dimensions( &this->window_width, &this->window_height ); + pthread_mutex_unlock( &mlt_sdl_mutex ); while ( SDL_PollEvent( &event ) ) { @@ -427,35 +424,41 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( this->sdl_screen == NULL || changed ) - { - // open SDL window - 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 ); - changed = 1; - } - else + if ( !SDL_GetVideoSurface() || changed ) { - changed = 1; - } + // open SDL window + pthread_mutex_lock( &mlt_sdl_mutex ); + consumer_get_dimensions( &this->window_width, &this->window_height ); + SDL_Surface *screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + if ( screen ) + { + 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 ); + } + mlt_properties_set_int( MLT_FRAME_PROPERTIES( frame ), "test_audio", 1 ); 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_frame_get_original_producer( frame ) && + !mlt_properties_get_int( MLT_FRAME_PROPERTIES( frame ), "refresh" ) ) { sdl_unlock_display( ); + mlt_cocoa_autorelease_close( pool ); if ( unlock != NULL ) unlock( ); + struct timespec tm = { 0, 100000 }; + nanosleep( &tm, NULL ); return 0; } // 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_frame_get_original_producer( frame ); // Get the image, width and height mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); if ( image != NULL ) { @@ -492,36 +495,38 @@ 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 ) { - memset( this->sdl_screen->pixels, 0, this->window_width * this->window_height * this->sdl_screen->format->BytesPerPixel ); - - 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 - SDL_Flip( this->sdl_screen ); + SDL_Flip( screen ); } + pthread_mutex_unlock( &mlt_sdl_mutex ); sdl_unlock_display(); - + mlt_cocoa_autorelease_close( pool ); if ( unlock != NULL ) unlock( ); + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); return 1; } @@ -537,21 +542,10 @@ static void *consumer_thread( void *arg ) // Get the consumer mlt_consumer consumer = &this->parent; mlt_properties properties = MLT_CONSUMER_PROPERTIES( consumer ); - - // internal intialization mlt_frame frame = NULL; - mlt_image_format vfmt = mlt_image_rgb24a; - int height = this->height; - int width = this->width; - uint8_t *image = NULL; // Allow the hosting app to provide the preview int preview_off = mlt_properties_get_int( properties, "preview_off" ); - mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" ); - - // Check if a specific colour space has been requested - if ( preview_off && preview_format != mlt_image_none ) - vfmt = preview_format; // Loop until told not to while( this->running ) @@ -568,6 +562,16 @@ static void *consumer_thread( void *arg ) } else { + mlt_image_format vfmt = mlt_image_rgb24a; + int height = this->height; + int width = this->width; + uint8_t *image = NULL; + mlt_image_format preview_format = mlt_properties_get_int( properties, "preview_format" ); + + // Check if a specific colour space has been requested + if ( preview_off && preview_format != mlt_image_none ) + vfmt = preview_format; + 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 ); @@ -594,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 ) { @@ -620,6 +625,7 @@ static int consumer_get_dimensions( int *width, int *height ) } #endif } +#endif return changed; }