if ( !this->running )
{
- pthread_attr_t thread_attributes;
-
consumer_stop( parent );
this->running = 1;
this->joined = 0;
this->last_speed = 1;
- // 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;
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( play, "height", mlt_properties_get_int( properties, "height" ) );
mlt_properties_set_int( still, "height", mlt_properties_get_int( properties, "height" ) );
- 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." );
// Get the speed of the frame
double speed = mlt_properties_get_double( MLT_FRAME_PROPERTIES( frame ), "_speed" );
- // Determine which speed to use
- double use_speed = speed;
-
// Lock during the operation
mlt_service_lock( MLT_CONSUMER_SERVICE( consumer ) );
}
else
{
- mlt_consumer_purge( this->play );
+ //mlt_consumer_purge( this->play );
last_position = -1;
}
mlt_consumer_put_frame( this->active, frame );
}
// If we aren't playing normally, then use the still
- else if ( use_speed != 1 )
+ else if ( speed != 1 )
{
if ( !mlt_consumer_is_stopped( this->play ) )
mlt_consumer_stop( this->play );
if ( mlt_consumer_is_stopped( this->still ) )
{
- this->last_speed = use_speed;
+ this->last_speed = speed;
this->active = this->still;
this->ignore_change = 0;
mlt_consumer_start( this->still );
mlt_consumer_stop( this->still );
if ( mlt_consumer_is_stopped( this->play ) )
{
- this->last_speed = use_speed;
+ this->last_speed = speed;
this->active = this->play;
this->ignore_change = 25;
mlt_consumer_start( this->play );
if ( this->active == this->still )
{
pthread_mutex_lock( &this->refresh_mutex );
- if ( speed == 0 && this->refresh_count == 0 )
+ if ( speed == 0 && this->refresh_count <= 0 )
pthread_cond_wait( &this->refresh_cond, &this->refresh_mutex );
- this->refresh_count = 0;
+ this->refresh_count --;
pthread_mutex_unlock( &this->refresh_mutex );
}
// We are definitely not waiting on the first frame any more
first = 0;
}
+ else
+ {
+ this->running = 0;
+ }
}
- mlt_consumer_stop( this->play );
- mlt_consumer_stop( this->still );
+ //mlt_consumer_stop( this->play );
+ //mlt_consumer_stop( this->still );
- SDL_Quit( );
+ //SDL_Quit( );
return NULL;
}
// Stop the consumer
mlt_consumer_stop( parent );
- // Now clean up the rest
- mlt_consumer_close( parent );
-
// Close the child consumers
mlt_consumer_close( this->play );
mlt_consumer_close( this->still );
+ // Now clean up the rest
+ mlt_consumer_close( parent );
+
// Finally clean up this
free( this );
}