pthread_cond_broadcast( &this->refresh_cond );
pthread_mutex_unlock( &this->refresh_mutex );
- if ( this->play ) mlt_consumer_stop( this->play );
- if ( this->still ) mlt_consumer_stop( this->still );
-
pthread_join( this->thread, NULL );
this->joined = 1;
mlt_properties play = MLT_CONSUMER_PROPERTIES( this->play );
mlt_properties still = MLT_CONSUMER_PROPERTIES( this->still );
+ int progressive = mlt_properties_get_int( properties, "progressive" ) | mlt_properties_get_int( properties, "deinterlace" );
+
if ( SDL_Init( SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE ) < 0 )
{
fprintf( stderr, "Failed to initialize SDL: %s\n", SDL_GetError() );
mlt_properties_set_int( still, "width", mlt_properties_get_int( properties, "width" ) );
mlt_properties_set_int( play, "height", mlt_properties_get_int( properties, "height" ) );
mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) );
+ mlt_properties_set_double( play, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+ mlt_properties_set_double( still, "aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) );
+ mlt_properties_set_double( play, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
+ mlt_properties_set_double( still, "display_ratio", mlt_properties_get_double( properties, "display_ratio" ) );
- mlt_properties_set_int( play, "progressive", 1 );
- mlt_properties_set_int( still, "progressive", 1 );
+ mlt_properties_set_int( play, "progressive", progressive );
+ mlt_properties_set_int( still, "progressive", progressive );
+ mlt_properties_set( play, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
+ mlt_properties_set( still, "deinterlace_method", mlt_properties_get( properties, "deinterlace_method" ) );
mlt_properties_pass( play, MLT_CONSUMER_PROPERTIES( consumer ), "play." );
mlt_properties_pass( still, MLT_CONSUMER_PROPERTIES( consumer ), "still." );
mlt_properties_set_int( play, "put_mode", 1 );
mlt_properties_set_int( still, "put_mode", 1 );
+ this->refresh_count = 0;
+
// Loop until told not to
while( this->running )
{
frame = mlt_consumer_get_frame( consumer );
// Ensure that we have a frame
- if ( frame != NULL )
+ if ( this->running && frame != NULL )
{
// Get the speed of the frame
double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
if ( this->active == this->still )
{
pthread_mutex_lock( &this->refresh_mutex );
- if ( speed == 0 && this->refresh_count <= 0 )
+ if ( this->running && speed == 0 && this->refresh_count <= 0 )
pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex );
this->refresh_count --;
pthread_mutex_unlock( &this->refresh_mutex );
}
else
{
+ if ( frame ) mlt_frame_close( frame );
+ mlt_consumer_put_frame( this->active, NULL );
this->running = 0;
}
}
- //mlt_consumer_stop( this->play );
- //mlt_consumer_stop( this->still );
+ if ( this->play ) mlt_consumer_stop( this->play );
+ if ( this->still ) mlt_consumer_stop( this->still );
//SDL_Quit( );