#include <GL/glx.h>
#endif
-void deleteManager(GlslManager *p)
+void dec_ref_and_delete(GlslManager *p)
{
- delete p;
+ if (p->dec_ref() == 0) {
+ delete p;
+ }
}
GlslManager::GlslManager()
, pbo(0)
, initEvent(0)
, closeEvent(0)
+ , prev_sync(NULL)
{
mlt_filter filter = get_filter();
if ( filter ) {
// Set the mlt_filter child in case we choose to override virtual functions.
filter->child = this;
- mlt_properties_set_data(mlt_global_properties(), "glslManager", this, 0,
- (mlt_destructor) deleteManager, NULL);
+ add_ref(mlt_global_properties());
mlt_events_register( get_properties(), "init glsl", NULL );
mlt_events_register( get_properties(), "close glsl", NULL );
// delete (glsl_texture) texture_list.pop_back();
delete initEvent;
delete closeEvent;
+ if (prev_sync != NULL) {
+ glDeleteSync( prev_sync );
+ }
+ while (syncs_to_delete.count() > 0) {
+ GLsync sync = (GLsync) syncs_to_delete.pop_front();
+ glDeleteSync( sync );
+ }
+}
+
+void GlslManager::add_ref(mlt_properties properties)
+{
+ inc_ref();
+ mlt_properties_set_data(properties, "glslManager", this, 0,
+ (mlt_destructor) dec_ref_and_delete, NULL);
}
GlslManager* GlslManager::get_instance()
texture->used = 0;
}
+void GlslManager::delete_sync(GLsync sync)
+{
+ // We do not know which thread we are called from, and we can only
+ // delete this if we are in one with a valid OpenGL context.
+ // Thus, store it for later deletion in render_frame_texture().
+ GlslManager* g = GlslManager::get_instance();
+ g->lock();
+ g->syncs_to_delete.push_back(sync);
+ g->unlock();
+}
+
glsl_pbo GlslManager::get_pbo(int size)
{
lock();
Mlt::Service service( aservice );
service.lock();
service.set( "movit chain", NULL, 0 );
- service.set( "movit input", NULL, 0 );
- // Destroy the effect list.
- GlslManager::get_instance()->set( service.get( "_unique_id" ), NULL, 0 );
service.unlock();
}
} // extern "C"
-Mlt::Properties GlslManager::effect_list( Mlt::Service& service )
+static void deleteChain( GlslChain* chain )
{
- char *unique_id = service.get( "_unique_id" );
- mlt_properties properties = (mlt_properties) get_data( unique_id );
- if ( !properties ) {
- properties = mlt_properties_new();
- set( unique_id, properties, 0, (mlt_destructor) mlt_properties_close );
- }
- Mlt::Properties p( properties );
- return p;
+ delete chain->effect_chain;
+ delete chain;
+}
+
+void* GlslManager::get_frame_specific_data( mlt_service service, mlt_frame frame, const char *key, int *length )
+{
+ const char *unique_id = mlt_properties_get( MLT_SERVICE_PROPERTIES(service), "_unique_id" );
+ char buf[256];
+ snprintf( buf, sizeof(buf), "%s_%s", key, unique_id );
+ return mlt_properties_get_data( MLT_FRAME_PROPERTIES(frame), buf, length );
}
-static void deleteChain( EffectChain* chain )
+int GlslManager::set_frame_specific_data( mlt_service service, mlt_frame frame, const char *key, void *value, int length, mlt_destructor destroy, mlt_serialiser serialise )
{
- delete chain;
+ const char *unique_id = mlt_properties_get( MLT_SERVICE_PROPERTIES(service), "_unique_id" );
+ char buf[256];
+ snprintf( buf, sizeof(buf), "%s_%s", key, unique_id );
+ return mlt_properties_set_data( MLT_FRAME_PROPERTIES(frame), buf, value, length, destroy, serialise );
}
-bool GlslManager::init_chain( mlt_service aservice )
+void GlslManager::set_chain( mlt_service service, GlslChain* chain )
{
- bool error = true;
- Mlt::Service service( aservice );
- EffectChain* chain = (EffectChain*) service.get_data( "movit chain" );
- if ( !chain ) {
- mlt_profile profile = mlt_service_profile( aservice );
- Input* input = new MltInput( profile->width, profile->height );
- chain = new EffectChain( profile->display_aspect_num, profile->display_aspect_den );
- chain->add_input( input );
- service.set( "movit chain", chain, 0, (mlt_destructor) deleteChain );
- service.set( "movit input", input, 0 );
- service.set( "_movit finalized", 0 );
- service.listen( "service-changed", aservice, (mlt_listener) GlslManager::onServiceChanged );
- service.listen( "property-changed", aservice, (mlt_listener) GlslManager::onPropertyChanged );
- error = false;
- }
- return error;
+ mlt_properties_set_data( MLT_SERVICE_PROPERTIES(service), "_movit chain", chain, 0, (mlt_destructor) deleteChain, NULL );
+}
+
+GlslChain* GlslManager::get_chain( mlt_service service )
+{
+ return (GlslChain*) mlt_properties_get_data( MLT_SERVICE_PROPERTIES(service), "_movit chain", NULL );
+}
+
+Effect* GlslManager::get_effect( mlt_service service, mlt_frame frame )
+{
+ return (Effect*) get_frame_specific_data( service, frame, "_movit effect", NULL );
}
-EffectChain* GlslManager::get_chain( mlt_service service )
+Effect* GlslManager::set_effect( mlt_service service, mlt_frame frame, Effect* effect )
{
- return (EffectChain*) mlt_properties_get_data( MLT_SERVICE_PROPERTIES(service), "movit chain", NULL );
+ set_frame_specific_data( service, frame, "_movit effect", effect, 0, NULL, NULL );
+ return effect;
}
-MltInput *GlslManager::get_input( mlt_service service )
+MltInput* GlslManager::get_input( mlt_producer producer, mlt_frame frame )
{
- return (MltInput*) mlt_properties_get_data( MLT_SERVICE_PROPERTIES(service), "movit input", NULL );
+ return (MltInput*) get_frame_specific_data( MLT_PRODUCER_SERVICE(producer), frame, "_movit input", NULL );
}
-void GlslManager::reset_finalized( mlt_service service )
+MltInput* GlslManager::set_input( mlt_producer producer, mlt_frame frame, MltInput* input )
{
- mlt_properties_set_int( MLT_SERVICE_PROPERTIES(service), "_movit finalized", 0 );
+ set_frame_specific_data( MLT_PRODUCER_SERVICE(producer), frame, "_movit input", input, 0, NULL, NULL );
+ return input;
}
-Effect* GlslManager::get_effect( mlt_filter filter, mlt_frame frame )
+uint8_t* GlslManager::get_input_pixel_pointer( mlt_producer producer, mlt_frame frame )
{
- Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) );
- char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" );
- return (Effect*) GlslManager::get_instance()->effect_list( producer ).get_data( unique_id );
+ return (uint8_t*) get_frame_specific_data( MLT_PRODUCER_SERVICE(producer), frame, "_movit input pp", NULL );
}
-Effect* GlslManager::add_effect( mlt_filter filter, mlt_frame frame, Effect* effect )
+uint8_t* GlslManager::set_input_pixel_pointer( mlt_producer producer, mlt_frame frame, uint8_t* image )
{
- Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) );
- EffectChain* chain = (EffectChain*) producer.get_data( "movit chain" );
- chain->add_effect( effect );
- char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" );
- GlslManager::get_instance()->effect_list( producer ).set( unique_id, effect, 0 );
- return effect;
+ set_frame_specific_data( MLT_PRODUCER_SERVICE(producer), frame, "_movit input pp", image, 0, NULL, NULL );
+ return image;
}
-Effect* GlslManager::add_effect( mlt_filter filter, mlt_frame frame, Effect* effect, Effect* input_b )
+mlt_service GlslManager::get_effect_input( mlt_service service, mlt_frame frame )
{
- Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) );
- EffectChain* chain = (EffectChain*) producer.get_data( "movit chain" );
- chain->add_effect( effect, chain->last_added_effect(),
- input_b? input_b : chain->last_added_effect() );
- char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" );
- GlslManager::get_instance()->effect_list( producer ).set( unique_id, effect, 0 );
- return effect;
+ return (mlt_service) get_frame_specific_data( service, frame, "_movit effect input", NULL );
}
-void GlslManager::render_fbo( mlt_service service, void* chain, GLuint fbo, int width, int height )
+void GlslManager::set_effect_input( mlt_service service, mlt_frame frame, mlt_service input_service )
{
- EffectChain* effect_chain = (EffectChain*) chain;
- mlt_properties properties = MLT_SERVICE_PROPERTIES( service );
- if ( !mlt_properties_get_int( properties, "_movit finalized" ) ) {
- mlt_properties_set_int( properties, "_movit finalized", 1 );
- effect_chain->add_effect( new Mlt::VerticalFlip() );
- effect_chain->finalize();
- }
- effect_chain->render_to_fbo( fbo, width, height );
+ set_frame_specific_data( service, frame, "_movit effect input", input_service, 0, NULL, NULL );
+}
+
+void GlslManager::get_effect_secondary_input( mlt_service service, mlt_frame frame, mlt_service *input_service, mlt_frame *input_frame)
+{
+ *input_service = (mlt_service) get_frame_specific_data( service, frame, "_movit effect secondary input", NULL );
+ *input_frame = (mlt_frame) get_frame_specific_data( service, frame, "_movit effect secondary input frame", NULL );
+}
+
+void GlslManager::set_effect_secondary_input( mlt_service service, mlt_frame frame, mlt_service input_service, mlt_frame input_frame )
+{
+ set_frame_specific_data( service, frame, "_movit effect secondary input", input_service, 0, NULL, NULL );
+ set_frame_specific_data( service, frame, "_movit effect secondary input frame", input_frame, 0, NULL, NULL );
}
-int GlslManager::render_frame_texture(mlt_service service, mlt_frame frame, int width, int height, uint8_t **image)
+int GlslManager::render_frame_texture(EffectChain *chain, mlt_frame frame, int width, int height, uint8_t **image)
{
- EffectChain* chain = get_chain( service );
- if (!chain) return 1;
glsl_fbo fbo = get_fbo( width, height );
if (!fbo) return 1;
glsl_texture texture = get_texture( width, height, GL_RGBA );
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
check_error();
- render_fbo( service, chain, fbo->fbo, width, height );
+ lock();
+ while (syncs_to_delete.count() > 0) {
+ GLsync sync = (GLsync) syncs_to_delete.pop_front();
+ glDeleteSync( sync );
+ }
+ unlock();
+
+ // Make sure we never have more than one frame pending at any time.
+ // This ensures we do not swamp the GPU with so much work
+ // that we cannot actually display the frames we generate.
+ if (prev_sync != NULL) {
+ glFlush();
+ glClientWaitSync( prev_sync, 0, GL_TIMEOUT_IGNORED );
+ glDeleteSync( prev_sync );
+ }
+ chain->render_to_fbo( fbo->fbo, width, height );
+ prev_sync = glFenceSync( GL_SYNC_GPU_COMMANDS_COMPLETE, 0 );
+ GLsync sync = glFenceSync( GL_SYNC_GPU_COMMANDS_COMPLETE, 0 );
- glFinish();
check_error();
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
check_error();
mlt_frame_set_image( frame, *image, 0, NULL );
mlt_properties_set_data( MLT_FRAME_PROPERTIES(frame), "movit.convert.texture", texture, 0,
(mlt_destructor) GlslManager::release_texture, NULL );
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES(frame), "movit.convert.fence", sync, 0,
+ (mlt_destructor) GlslManager::delete_sync, NULL );
return 0;
}
-int GlslManager::render_frame_rgba(mlt_service service, mlt_frame frame, int width, int height, uint8_t **image)
+int GlslManager::render_frame_rgba(EffectChain *chain, mlt_frame frame, int width, int height, uint8_t **image)
{
- EffectChain* chain = get_chain( service );
- if (!chain) return 1;
glsl_fbo fbo = get_fbo( width, height );
if (!fbo) return 1;
glsl_texture texture = get_texture( width, height, GL_RGBA );
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
check_error();
- render_fbo( service, chain, fbo->fbo, width, height );
+ chain->render_to_fbo( fbo->fbo, width, height );
// Read FBO into PBO
glBindFramebuffer( GL_FRAMEBUFFER, fbo->fbo );
projects / mlt / blobdiff