X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=acb50982e4710081ceb47179bcefd87dc5234b2e;hb=3719f0ab8e239e0ddb38eb758bb745d11880787d;hp=c76740a379bfbaca5701736e69f2643b1b645557;hpb=2c45078156a37791453f0e1f9244aac5aeaf172b;p=melted diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index c76740a..acb5098 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; @@ -86,13 +83,16 @@ mlt_consumer consumer_sdl_still_init( char *arg ) // Get the parent consumer object mlt_consumer parent = &this->parent; - // 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 ); + // 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; + // Default scaler (for now we'll use nearest) mlt_properties_set( this->properties, "rescale", "nearest" ); @@ -102,30 +102,27 @@ 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" ); } + else + { + mlt_properties_set_int( this->properties, "width", this->width ); + mlt_properties_set_int( this->properties, "height", this->height ); + } // 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; - // Experimental settings - this->sdl_flags = SDL_RESIZABLE | SDL_DOUBLEBUF; + this->sdl_flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_DOUBLEBUF; // Allow thread to be started/stopped parent->start = consumer_start; @@ -158,6 +155,9 @@ static int consumer_start( mlt_consumer parent ) if ( !this->running ) { + 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 ) { @@ -175,13 +175,31 @@ 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" ); + + 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; + } + + 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 ); + } } - //this->width = this->height * this->display_aspect; + 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, NULL, consumer_thread, this ); } @@ -196,11 +214,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; @@ -243,11 +269,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 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -272,11 +298,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 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -302,11 +328,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 ) * 3 ); pixel = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); *p ++ = (pixel & 0xFF0000) >> 16; *p ++ = (pixel & 0x00FF00) >> 8; @@ -334,11 +360,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 ) * 3 ); *p ++ = SDL_MapRGB( screen->format, *q, *( q + 1 ), *( q + 2 ) ); } start += scanlength; @@ -355,6 +381,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 ); @@ -400,20 +427,17 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) } } - 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, 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; - mlt_properties_set_int( properties, "changed", 0 ); } else { changed = 1; - mlt_properties_set_int( properties, "changed", 0 ); } if ( changed == 0 && @@ -421,8 +445,7 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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; } @@ -431,27 +454,15 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) 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 ( 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 +473,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 ) @@ -525,31 +536,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; + 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 ) - { - this->sdl_screen = SDL_GetVideoSurface( ); - consumer_get_dimensions( &this->window_width, &this->window_height ); - mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "changed", 0 ); - } - } + // 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 ) @@ -558,22 +560,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 ); } 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; }