X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=3efd8f4eb63c389338bfcac4eb7d7c23c2eeee3e;hb=1f2e5621296c35af5d2e2e0756087d2e214e7430;hp=3cf9d097051195964e7cc18ab893b9578801db02;hpb=59456c0f8d288d6bfa6df60d692b9209741ab02e;p=melted diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 3cf9d09..3efd8f4 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -3,22 +3,22 @@ * Copyright (C) 2003-2004 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 @@ -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. @@ -74,30 +72,24 @@ 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 ); // 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; - // 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 ); // 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,25 +99,20 @@ 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 ) { 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; - this->window_height = this->height; + else + { + mlt_properties_set_int( this->properties, "width", this->width ); + mlt_properties_set_int( this->properties, "height", this->height ); + } // Set the sdl flags this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; @@ -161,8 +148,20 @@ static int consumer_start( mlt_consumer parent ) if ( !this->running ) { - pthread_attr_t thread_attributes; - + 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_profile profile = mlt_service_profile( MLT_CONSUMER_SERVICE( parent ) ); + mlt_filter filter = mlt_factory_filter( profile, "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; @@ -170,19 +169,37 @@ static int consumer_start( mlt_consumer parent ) this->joined = 0; // Allow the user to force resizing to window size - if ( mlt_properties_get_int( this->properties, "resize" ) ) + 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; + this->window_height = this->height; + + if ( sdl_started == 0 && preview_off == 0 ) { - mlt_properties_set_int( this->properties, "width", this->width ); - mlt_properties_set_int( this->properties, "height", this->height ); - } + if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) + { + fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() ); + return -1; + } - //this->width = this->height * this->display_aspect; + 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( ); + } + } - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); + if ( this->sdl_screen == NULL && preview_off == 0 ) + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -195,11 +212,19 @@ static int consumer_stop( mlt_consumer parent ) if ( this->joined == 0 ) { + 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; pthread_join( this->thread, NULL ); this->joined = 1; + + if ( sdl_started == 0 && preview_off == 0 ) + SDL_Quit( ); + + this->sdl_screen = NULL; } return 0; @@ -224,6 +249,130 @@ static void sdl_unlock_display( ) SDL_UnlockSurface( screen ); } +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 x, y, row_index; + uint8_t *q, *row; + + // Constants defined for clarity and optimisation + int scanlength = screen->pitch; + uint8_t *start = ( uint8_t * )screen->pixels + rect.y * scanlength + rect.x; + uint8_t *p; + + // Iterate through the screen using a very basic scaling algorithm + for ( y = 0; y < rect.h; y ++ ) + { + p = start; + row_index = ( 32768 + scale_height * y ) >> 16; + row = image + stride * row_index; + for ( x = 0; x < rect.w; x ++ ) + { + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); + *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); + } + start += scanlength; + } +} + +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 x, y, row_index; + uint8_t *q, *row; + + // Constants defined for clarity and optimisation + int scanlength = screen->pitch / 2; + uint16_t *start = ( uint16_t * )screen->pixels + rect.y * scanlength + rect.x; + uint16_t *p; + + // Iterate through the screen using a very basic scaling algorithm + for ( y = 0; y < rect.h; y ++ ) + { + p = start; + row_index = ( 32768 + scale_height * y ) >> 16; + row = image + stride * row_index; + for ( x = 0; x < rect.w; x ++ ) + { + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); + *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); + } + start += scanlength; + } +} + +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 x, y, row_index; + uint8_t *q, *row; + + // Constants defined for clarity and optimisation + int scanlength = screen->pitch; + uint8_t *start = ( uint8_t * )screen->pixels + rect.y * scanlength + rect.x; + uint8_t *p; + uint32_t pixel; + + // Iterate through the screen using a very basic scaling algorithm + for ( y = 0; y < rect.h; y ++ ) + { + p = start; + row_index = ( 32768 + scale_height * y ) >> 16; + row = image + stride * row_index; + for ( x = 0; x < rect.w; x ++ ) + { + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); + pixel = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); + *p ++ = (pixel & 0xFF0000) >> 16; + *p ++ = (pixel & 0x00FF00) >> 8; + *p ++ = (pixel & 0x0000FF); + } + start += scanlength; + } +} + +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 x, y, row_index; + uint8_t *q, *row; + + // Constants defined for clarity and optimisation + int scanlength = screen->pitch / 4; + uint32_t *start = ( uint32_t * )screen->pixels + rect.y * scanlength + rect.x; + uint32_t *p; + + // Iterate through the screen using a very basic scaling algorithm + for ( y = 0; y < rect.h; y ++ ) + { + p = start; + row_index = ( 32768 + scale_height * y ) >> 16; + row = image + stride * row_index; + for ( x = 0; x < rect.w; x ++ ) + { + q = row + ( ( ( 32768 + scale_width * x ) >> 16 ) * 3 ); + *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); + } + start += scanlength; + } +} + static int consumer_play_video( consumer_sdl this, mlt_frame frame ) { // Get the properties of this consumer @@ -234,6 +383,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 ); @@ -279,126 +429,92 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - if ( ( ( int )( this->last_frame_aspect * 1000 ) != ( int )( mlt_frame_get_aspect_ratio( frame ) * 1000 ) && - ( mlt_frame_get_aspect_ratio( frame ) != 1.0 || this->last_frame_aspect == 0.0 ) ) ) - { - this->last_frame_aspect = mlt_frame_get_aspect_ratio( frame ); - changed = 1; - } - - if ( this->sdl_screen == NULL || changed || mlt_properties_get_int( properties, "changed" ) == 2 ) + if ( this->sdl_screen == NULL || changed ) { // open SDL window - this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 16, this->sdl_flags ); + 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, 16, this->sdl_flags ); - + this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags ); + uint32_t color = mlt_properties_get_int( this->properties, "window_background" ); + SDL_FillRect( this->sdl_screen, NULL, color >> 8 ); changed = 1; - mlt_properties_set_int( properties, "changed", 0 ); - - // May as well use the mlt rescaler... - //if ( mlt_properties_get( properties, "rescale" ) != NULL && !strcmp( mlt_properties_get( properties, "rescale" ), "none" ) ) - //mlt_properties_set( properties, "rescale", "nearest" ); - - // Determine window's new display aspect ratio - float this_aspect = this->display_aspect / ( ( float )this->window_width / ( float )this->window_height ); - - this->rect.w = 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 = ( 1.0 / this_aspect ) * this->window_height; - } - - this->rect.x = ( this->window_width - this->rect.w ) / 2; - this->rect.y = ( this->window_height - this->rect.h ) / 2; - - 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 ); } else { - changed = mlt_properties_get_int( properties, "changed" ) | mlt_properties_get_int( mlt_frame_properties( frame ), "refresh" ); - mlt_properties_set_int( properties, "changed", 0 ); + changed = 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_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "_producer", NULL ) ) { sdl_unlock_display( ); - if ( unlock != NULL ) - unlock( ); + if ( unlock != NULL ) unlock( ); 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_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_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); - } + mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 ); + mlt_events_fire( properties, "consumer-frame-show", frame, NULL ); - if ( this->sdl_screen != NULL ) + if ( image != NULL ) { - // Calculate the scan length - int scanlength = this->sdl_screen->pitch / 2; - - // Obtain the clip rect from the screen - SDL_Rect rect = this->rect; - - // Generate the affine transform scaling values - int scale_width = ( width << 16 ) / rect.w; - int scale_height = ( height << 16 ) / rect.h; - - // Constants defined for clarity and optimisation - int stride = width * 3; - uint16_t *start = ( uint16_t * )this->sdl_screen->pixels + rect.y * scanlength + rect.x; - - int x, y, row_index; - uint16_t *p; - uint8_t *q, *row; - - // Iterate through the screen using a very basic scaling algorithm - for ( y = 0; y < rect.h && this->last_position != -1; y ++ ) + char *rescale = mlt_properties_get( properties, "rescale" ); + if ( rescale != NULL && strcmp( rescale, "none" ) ) { - // Obtain the pointer to the current screen row - p = start; - - // Calculate the row_index - row_index = ( scale_height * y ) >> 16; - - // Calculate the pointer for the y offset (positioned on B instead of R) - row = image + stride * row_index; - - // Iterate through the screen width - for ( x = 0; x < rect.w; x ++ ) + 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 ) { - // Obtain the pixel pointer - q = row + ( ( ( scale_width * x ) >> 16 ) * 3 ); - - // Map the BGR colour from the frame to the SDL format - *p ++ = SDL_MapRGB( this->sdl_screen->format, *q, *( q + 1 ), *( q + 2 ) ); + this->rect.w = this->window_width; + this->rect.h = ( 1.0 / this_aspect ) * this->window_height; } + } + else + { + 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 ) + { + this->rect.w = this->window_width; + this->rect.h = ( 1.0 / frame_aspect ) * this->window_width; + } + } - // Move to the next row - start += scanlength; + this->rect.x = ( this->window_width - this->rect.w ) / 2; + this->rect.y = ( this->window_height - this->rect.h ) / 2; + + 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 ( !mlt_consumer_is_stopped( &this->parent ) && SDL_GetVideoSurface( ) != NULL && this->sdl_screen != NULL && this->sdl_screen->pixels != NULL ) + { + switch( this->sdl_screen->format->BytesPerPixel ) + { + case 1: + display_1( this->sdl_screen, this->rect, image, width, height ); + break; + case 2: + display_2( this->sdl_screen, this->rect, image, width, height ); + break; + case 3: + display_3( this->sdl_screen, this->rect, image, width, height ); + break; + case 4: + display_4( this->sdl_screen, this->rect, image, width, height ); + break; + default: + fprintf( stderr, "Unsupported video depth %d\n", this->sdl_screen->format->BytesPerPixel ); + break; } // Flip it into sight @@ -409,7 +525,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) if ( unlock != NULL ) unlock( ); - return 0; + return 1; } /** Threaded wrapper for pipe. @@ -422,28 +538,22 @@ 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; - struct timespec tm = { 0, 1000 }; + mlt_image_format vfmt = mlt_image_rgb24a; + int height = this->height; + int width = this->width; + uint8_t *image = NULL; - 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; - } + // 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" ); - 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 ) - consumer_get_dimensions( &this->window_width, &this->window_height ); - } + // 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 ) @@ -452,19 +562,27 @@ 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 ); + if ( preview_off == 0 ) + { + consumer_play_video( this, frame ); + } + else + { + 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 ); + } 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; } @@ -481,6 +599,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 ) { @@ -501,6 +620,7 @@ static int consumer_get_dimensions( int *width, int *height ) *width = attr.width; *height = attr.height; } +#endif } return changed;