X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fframework%2Fmlt_consumer.c;h=b904f13796f1a29bd7e87af357bd6d77e8a3822c;hb=90da79f8e465d43102645de7323d15c12801515f;hp=4422b111389c7ac95f5120ff5d7c9b9d7005934c;hpb=4a39b72c5ac8fd2dd6db81a95eab08adde0491b9;p=melted diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index 4422b11..b904f13 100644 --- a/src/framework/mlt_consumer.c +++ b/src/framework/mlt_consumer.c @@ -55,7 +55,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 576 ); mlt_properties_set_int( properties, "progressive", 0 ); - mlt_properties_set_double( properties, "aspect_ratio", 128.0 / 117.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 59.0 / 54.0 ); } else { @@ -64,7 +64,7 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_properties_set_int( properties, "width", 720 ); mlt_properties_set_int( properties, "height", 480 ); mlt_properties_set_int( properties, "progressive", 0 ); - mlt_properties_set_double( properties, "aspect_ratio", 72.0 / 79.0 ); + mlt_properties_set_double( properties, "aspect_ratio", 10.0 / 11.0 ); } // Default rescaler for all consumers @@ -88,6 +88,11 @@ int mlt_consumer_init( mlt_consumer this, void *child ) mlt_events_register( properties, "consumer-frame-show", ( mlt_transmitter )mlt_consumer_frame_show ); mlt_events_register( properties, "consumer-stopped", NULL ); + + // Create the push mutex and condition + pthread_mutex_init( &this->put_mutex, NULL ); + pthread_cond_init( &this->put_cond, NULL ); + } return error; } @@ -149,6 +154,10 @@ int mlt_consumer_start( mlt_consumer this ) // Determine if there's a test card producer char *test_card = mlt_properties_get( properties, "test_card" ); + // Just to make sure nothing is hanging around... + mlt_frame_close( this->put ); + this->put = NULL; + // Deal with it now. if ( test_card != NULL ) { @@ -161,7 +170,9 @@ int mlt_consumer_start( mlt_consumer this ) if ( producer != NULL ) { // Test card should loop I guess... - mlt_properties_set( mlt_producer_properties( producer ), "eof", "loop" ); + mlt_properties_set( mlt_producer_properties( producer ), "eof", "pause" ); + mlt_producer_set_speed( producer, 0 ); + mlt_producer_set_in_and_out( producer, 0, 0 ); // Set the test card on the consumer mlt_properties_set_data( properties, "test_card_producer", producer, 0, ( mlt_destructor )mlt_producer_close, NULL ); @@ -188,6 +199,44 @@ int mlt_consumer_start( mlt_consumer this ) return 0; } +/** An alternative method to feed frames into the consumer - only valid if + the consumer itself is not connected. +*/ + +int mlt_consumer_put_frame( mlt_consumer this, mlt_frame frame ) +{ + int error = 1; + + // Get the service assoicated to the consumer + mlt_service service = mlt_consumer_service( this ); + + if ( mlt_service_producer( service ) == NULL ) + { + struct timeval now; + struct timespec tm; + pthread_mutex_lock( &this->put_mutex ); + while ( !mlt_consumer_is_stopped( this ) && this->put != NULL ) + { + gettimeofday( &now, NULL ); + tm.tv_sec = now.tv_sec + 1; + tm.tv_nsec = now.tv_usec * 1000; + pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm ); + } + if ( this->put == NULL ) + this->put = frame; + else + mlt_frame_close( frame ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + } + else + { + mlt_frame_close( frame ); + } + + return error; +} + /** Protected method for consumer to get frames from connected service */ @@ -199,12 +248,36 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Get the service assoicated to the consumer mlt_service service = mlt_consumer_service( this ); + // Get the consumer properties + mlt_properties properties = mlt_consumer_properties( this ); + // Get the frame - if ( mlt_service_get_frame( service, &frame, 0 ) == 0 ) + if ( mlt_service_producer( service ) == NULL && mlt_properties_get_int( properties, "put_mode" ) ) + { + struct timeval now; + struct timespec tm; + pthread_mutex_lock( &this->put_mutex ); + while ( !mlt_consumer_is_stopped( this ) && this->put == NULL ) + { + gettimeofday( &now, NULL ); + tm.tv_sec = now.tv_sec + 1; + tm.tv_nsec = now.tv_usec * 1000; + pthread_cond_timedwait( &this->put_cond, &this->put_mutex, &tm ); + } + frame = this->put; + this->put = NULL; + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + if ( frame != NULL ) + mlt_service_apply_filters( service, frame, 0 ); + } + else if ( mlt_service_producer( service ) != NULL ) { - // Get the consumer properties - mlt_properties properties = mlt_consumer_properties( this ); + mlt_service_get_frame( service, &frame, 0 ); + } + if ( frame != NULL ) + { // Get the frame properties mlt_properties frame_properties = mlt_frame_properties( frame ); @@ -221,7 +294,7 @@ mlt_frame mlt_consumer_get_frame( mlt_consumer this ) // Aspect ratio and other jiggery pokery mlt_properties_set_double( frame_properties, "consumer_aspect_ratio", mlt_properties_get_double( properties, "aspect_ratio" ) ); if ( mlt_properties_get_int( properties, "progressive" ) || mlt_properties_get_int( properties, "deinterlace" ) ) - mlt_properties_set_int( properties, "consumer_deinterlace", 1 ); + mlt_properties_set_int( frame_properties, "consumer_deinterlace", 1 ); } // Return the frame @@ -311,12 +384,17 @@ static void *consumer_read_ahead_thread( void *arg ) mlt_deque_push_back( this->queue, frame ); pthread_cond_broadcast( &this->cond ); pthread_mutex_unlock( &this->mutex ); + time_wait += time_difference( &ante ); // Get the next frame frame = mlt_consumer_get_frame( this ); time_frame += time_difference( &ante ); + // If there's no frame, we're probably stopped... + if ( frame == NULL ) + continue; + // Increment the count count ++; @@ -415,6 +493,11 @@ static void consumer_read_ahead_stop( mlt_consumer this ) pthread_cond_broadcast( &this->cond ); pthread_mutex_unlock( &this->mutex ); + // Broadcast to the put condition in case it's waiting + pthread_mutex_lock( &this->put_mutex ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + // Join the thread pthread_join( this->ahead_thread, NULL ); @@ -482,7 +565,8 @@ mlt_frame mlt_consumer_rt_frame( mlt_consumer this ) frame = mlt_consumer_get_frame( this ); // This isn't true, but from the consumers perspective it is - mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); + if ( frame != NULL ) + mlt_properties_set_int( mlt_frame_properties( frame ), "rendered", 1 ); } return frame; @@ -513,6 +597,11 @@ int mlt_consumer_stop( mlt_consumer this ) if ( mlt_properties_get_int( properties, "real_time" ) ) consumer_read_ahead_stop( this ); + // Just in case... + pthread_mutex_lock( &this->put_mutex ); + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_unlock( &this->put_mutex ); + // Kill the test card mlt_properties_set_data( properties, "test_card_producer", NULL, 0, NULL, NULL ); @@ -520,6 +609,12 @@ int mlt_consumer_stop( mlt_consumer this ) if ( mlt_properties_get( properties, "post" ) ) system( mlt_properties_get( properties, "post" ) ); + if ( this->put != NULL ) + { + mlt_frame_close( this->put ); + this->put = NULL; + } + return 0; } @@ -549,6 +644,11 @@ void mlt_consumer_close( mlt_consumer this ) this->close = NULL; this->parent.close = NULL; + // Destroy the push mutex and condition + pthread_cond_broadcast( &this->put_cond ); + pthread_mutex_destroy( &this->put_mutex ); + pthread_cond_destroy( &this->put_cond ); + // Call the childs close if available if ( consumer_close != NULL ) consumer_close( this );