int running;
int window_width;
int window_height;
- float aspect_ratio;
- float display_aspect;
- double last_frame_aspect;
int width;
int height;
int playing;
uint8_t *buffer;
int last_position;
mlt_producer last_producer;
+ int filtered;
};
/** Forward references to static functions.
// 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 );
+
+ // 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;
- // 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" );
// 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
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_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;
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;
+ }
- //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( );
+ consumer_get_dimensions( &this->window_width, &this->window_height );
+ }
+ }
- // 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;
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;
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 );
}
}
- 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 = 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 ( 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 )
}
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 )
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 );
// 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, 1000000 };
+ 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 )
frame = mlt_consumer_rt_frame( consumer );
// Ensure that we have a frame
- if ( frame != NULL )
+ if ( this->running && frame != NULL )
{
- if ( consumer_play_video( this, frame ) == 0 )
- nanosleep( &tm, NULL );
+ 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;
}
// Get the wm structure
if ( SDL_GetWMInfo( &wm ) == 1 )
{
+#ifndef __DARWIN__
// Check that we have the X11 wm
if ( wm.subsystem == SDL_SYSWM_X11 )
{
*width = attr.width;
*height = attr.height;
}
+#endif
}
return changed;
projects / mlt / blobdiff