int running;
int window_width;
int window_height;
- float aspect_ratio;
- float display_aspect;
- double last_frame_aspect;
int width;
int height;
int playing;
// 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" );
// 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 )
{
}
// 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
mlt_properties_set_int( this->properties, "height", this->height );
}
- //this->width = this->height * this->display_aspect;
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 0 )
+ {
+ 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
+ {
+ mlt_properties_set_int( MLT_CONSUMER_PROPERTIES( parent ), "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( parent ), "changed", 0 );
+ }
+ }
pthread_create( &this->thread, NULL, consumer_thread, this );
}
pthread_join( this->thread, NULL );
this->joined = 1;
+
+ if ( mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "sdl_started" ) == 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 );
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_events_fire( properties, "consumer-frame-show", frame, NULL );
+ mlt_frame_get_image( frame, &image, &vfmt, &width, &height, 0 );
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 )
// internal intialization
mlt_frame frame = 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;
- }
-
- 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 );
- }
- }
-
// 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 )
{
consumer_play_video( this, frame );
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 / melted / blobdiff