X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsdl%2Fconsumer_sdl_still.c;h=f2146f5eaa82083ad635291dbaf5ddf54f61c955;hb=01d0f9853dd68fc14493db560e4930b2e0e3e0e2;hp=82a231d332e867db5388990e9fbfe01bd7bb008a;hpb=00a5d9f88928966dc7b522b02bd791aa44a51238;p=melted diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c index 82a231d..f2146f5 100644 --- a/src/modules/sdl/consumer_sdl_still.c +++ b/src/modules/sdl/consumer_sdl_still.c @@ -57,6 +57,7 @@ struct consumer_sdl_s uint8_t *buffer; int last_position; mlt_producer last_producer; + int filtered; }; /** Forward references to static functions. @@ -85,18 +86,12 @@ 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 ); - // 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 ); + 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" ); @@ -128,7 +123,9 @@ mlt_consumer consumer_sdl_still_init( char *arg ) 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 +158,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; @@ -178,11 +183,7 @@ static int consumer_start( mlt_consumer parent ) //this->width = this->height * this->display_aspect; - // Inherit the scheduling priority - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); - - pthread_create( &this->thread, &thread_attributes, consumer_thread, this ); + pthread_create( &this->thread, NULL, consumer_thread, this ); } return 0; @@ -411,14 +412,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,7 +428,7 @@ 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 ) @@ -439,14 +439,14 @@ static int consumer_play_video( consumer_sdl this, mlt_frame frame ) // 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_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 ); } - if ( 1 ) + if ( image != NULL ) { char *rescale = mlt_properties_get( properties, "rescale" ); if ( rescale != NULL && strcmp( rescale, "none" ) ) @@ -481,7 +481,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 +512,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,9 +528,8 @@ static void *consumer_thread( void *arg ) // internal intialization mlt_frame frame = NULL; - struct timespec tm = { 0, 400000 }; - if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 ) + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) { if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 ) { @@ -543,12 +542,12 @@ static void *consumer_thread( void *arg ) } else { - mlt_properties_set_int( mlt_consumer_properties( consumer ), "changed", 2 ); + 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 ); + mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( consumer ), "changed", 0 ); } } @@ -563,11 +562,14 @@ static void *consumer_thread( void *arg ) { consumer_play_video( this, frame ); mlt_frame_close( frame ); - nanosleep( &tm, NULL ); + } + else + { + this->running = 0; } } - if ( mlt_properties_get_int( mlt_consumer_properties( consumer ), "sdl_started" ) == 0 ) + if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( consumer ), "sdl_started" ) == 0 ) SDL_Quit( ); this->sdl_screen = NULL;