X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fopengl%2Ffilter_glsl_manager.cpp;h=9cb0855cb5da0ea530df2e7c02cbdfbfbff14290;hb=cfa126d75a26e7a9e793134b7f1ccf9d2be9ee82;hp=e89471085565aa3dd6614f6f9d296795ef74aa51;hpb=cd87c4c715c1c3373cec5baded108ec5bd353fa2;p=mlt diff --git a/src/modules/opengl/filter_glsl_manager.cpp b/src/modules/opengl/filter_glsl_manager.cpp index e8947108..9cb0855c 100644 --- a/src/modules/opengl/filter_glsl_manager.cpp +++ b/src/modules/opengl/filter_glsl_manager.cpp @@ -20,22 +20,25 @@ #include #include -#include "glsl_manager.h" +#include "filter_glsl_manager.h" #include +#include #include #include "mlt_movit_input.h" #include "mlt_flip_effect.h" +#include +#include extern "C" { #include } -#ifdef WIN32 -#define SYS_gettid (224) -#define syscall(X) (((X == SYS_gettid) && GetCurrentThreadId()) || 0) +#if defined(__DARWIN__) +#include +#elif defined(WIN32) +#include #else -#include -#include +#include #endif void deleteManager(GlslManager *p) @@ -46,6 +49,9 @@ void deleteManager(GlslManager *p) GlslManager::GlslManager() : Mlt::Filter( mlt_filter_new() ) , pbo(0) + , initEvent(0) + , closeEvent(0) + , prev_sync(NULL) { mlt_filter filter = get_filter(); if ( filter ) { @@ -55,18 +61,29 @@ GlslManager::GlslManager() (mlt_destructor) deleteManager, NULL); mlt_events_register( get_properties(), "init glsl", NULL ); - listen("init glsl", this, (mlt_listener) GlslManager::onInit); + mlt_events_register( get_properties(), "close glsl", NULL ); + initEvent = listen("init glsl", this, (mlt_listener) GlslManager::onInit); + closeEvent = listen("close glsl", this, (mlt_listener) GlslManager::onClose); } } GlslManager::~GlslManager() { mlt_log_debug(get_service(), "%s\n", __FUNCTION__); - while (fbo_list.peek_back()) - delete (glsl_fbo) fbo_list.pop_back(); - while (texture_list.peek_back()) - delete (glsl_texture) texture_list.pop_back(); - delete pbo; + cleanupContext(); +// XXX If there is still a frame holding a reference to a texture after this +// destructor is called, then it will crash in release_texture(). +// while (texture_list.peek_back()) +// 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 ); + } } GlslManager* GlslManager::get_instance() @@ -76,13 +93,25 @@ GlslManager* GlslManager::get_instance() glsl_fbo GlslManager::get_fbo(int width, int height) { +#if defined(__DARWIN__) + CGLContextObj context = CGLGetCurrentContext(); +#elif defined(WIN32) + HGLRC context = wglGetCurrentContext(); +#else + GLXContext context = glXGetCurrentContext(); +#endif + + lock(); for (int i = 0; i < fbo_list.count(); ++i) { glsl_fbo fbo = (glsl_fbo) fbo_list.peek(i); - if (!fbo->used && (fbo->width == width) && (fbo->height == height)) { + if (!fbo->used && (fbo->width == width) && (fbo->height == height) && (fbo->context == context)) { fbo->used = 1; + unlock(); return fbo; } } + unlock(); + GLuint fb = 0; glGenFramebuffers(1, &fb); if (!fb) @@ -97,7 +126,10 @@ glsl_fbo GlslManager::get_fbo(int width, int height) fbo->width = width; fbo->height = height; fbo->used = 1; + fbo->context = context; + lock(); fbo_list.push_back(fbo); + unlock(); return fbo; } @@ -108,6 +140,7 @@ void GlslManager::release_fbo(glsl_fbo fbo) glsl_texture GlslManager::get_texture(int width, int height, GLint internal_format) { + lock(); for (int i = 0; i < texture_list.count(); ++i) { glsl_texture tex = (glsl_texture) texture_list.peek(i); if (!tex->used && (tex->width == width) && (tex->height == height) && (tex->internal_format == internal_format)) { @@ -116,19 +149,35 @@ glsl_texture GlslManager::get_texture(int width, int height, GLint internal_form glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glBindTexture( GL_TEXTURE_2D, 0); tex->used = 1; + unlock(); return tex; } } + + // Recycle a glsl_texture with deleted glTexture. + glsl_texture gtex = 0; + for (int i = 0; i < texture_list.count(); ++i) { + glsl_texture tex = (glsl_texture) texture_list.peek(i); + if (!tex->used && !tex->width && !tex->height) { + gtex = tex; + break; + } + } + unlock(); + GLuint tex = 0; glGenTextures(1, &tex); - if (!tex) + if (!tex) { + glDeleteTextures(1, &tex); return NULL; + } - glsl_texture gtex = new glsl_texture_s; if (!gtex) { - glDeleteTextures(1, &tex); - return NULL; + gtex = new glsl_texture_s; + if (!gtex) + return NULL; } + glBindTexture( GL_TEXTURE_2D, tex ); glTexImage2D( GL_TEXTURE_2D, 0, internal_format, width, height, 0, internal_format, GL_UNSIGNED_BYTE, NULL ); glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); @@ -142,7 +191,9 @@ glsl_texture GlslManager::get_texture(int width, int height, GLint internal_form gtex->height = height; gtex->internal_format = internal_format; gtex->used = 1; + lock(); texture_list.push_back(gtex); + unlock(); return gtex; } @@ -151,20 +202,36 @@ void GlslManager::release_texture(glsl_texture texture) 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(); if (!pbo) { GLuint pb = 0; glGenBuffers(1, &pb); - if (!pb) + if (!pb) { + unlock(); return NULL; + } pbo = new glsl_pbo_s; if (!pbo) { glDeleteBuffers(1, &pb); + unlock(); return NULL; } pbo->pbo = pb; + pbo->size = 0; } if (size > pbo->size) { glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo->pbo); @@ -172,12 +239,36 @@ glsl_pbo GlslManager::get_pbo(int size) glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0); pbo->size = size; } + unlock(); return pbo; } +void GlslManager::cleanupContext() +{ + lock(); + while (fbo_list.peek_back()) { + glsl_fbo fbo = (glsl_fbo) fbo_list.pop_back(); + glDeleteFramebuffers(1, &fbo->fbo); + delete fbo; + } + for (int i = 0; i < texture_list.count(); ++i) { + glsl_texture texture = (glsl_texture) texture_list.peek(i); + glDeleteTextures(1, &texture->texture); + texture->used = 0; + texture->width = 0; + texture->height = 0; + } + if (pbo) { + glDeleteBuffers(1, &pbo->pbo); + delete pbo; + pbo = 0; + } + unlock(); +} + void GlslManager::onInit( mlt_properties owner, GlslManager* filter ) { - mlt_log_verbose( filter->get_service(), "%s: %d\n", __FUNCTION__, syscall(SYS_gettid) ); + mlt_log_debug( filter->get_service(), "%s\n", __FUNCTION__ ); #ifdef WIN32 std::string path = std::string(mlt_environment("MLT_APPDIR")).append("\\share\\movit"); #elif defined(__DARWIN__) && defined(RELOCATABLE) @@ -189,6 +280,28 @@ void GlslManager::onInit( mlt_properties owner, GlslManager* filter ) filter->set( "glsl_supported", movit_initialized ); } +void GlslManager::onClose( mlt_properties owner, GlslManager *filter ) +{ + filter->cleanupContext(); +} + +void GlslManager::onServiceChanged( mlt_properties owner, mlt_service aservice ) +{ + 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(); +} + +void GlslManager::onPropertyChanged( mlt_properties owner, mlt_service service, const char* property ) +{ + if ( property && std::string( property ) == "disable" ) + onServiceChanged( owner, service ); +} + extern "C" { mlt_filter filter_glsl_manager_init( mlt_profile profile, mlt_service_type type, const char *id, char *arg ) @@ -203,24 +316,38 @@ mlt_filter filter_glsl_manager_init( mlt_profile profile, mlt_service_type type, } // extern "C" +Mlt::Properties GlslManager::effect_list( Mlt::Service& service ) +{ + 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; +} + static void deleteChain( EffectChain* chain ) { delete chain; } -bool GlslManager::init_chain( mlt_service service ) +bool GlslManager::init_chain( mlt_service aservice ) { bool error = true; - mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); - EffectChain* chain = (EffectChain*) mlt_properties_get_data( properties, "movit chain", NULL ); + Mlt::Service service( aservice ); + EffectChain* chain = (EffectChain*) service.get_data( "movit chain" ); if ( !chain ) { - mlt_profile profile = mlt_service_profile( service ); + 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 ); - mlt_properties_set_data( properties, "movit chain", chain, 0, (mlt_destructor) deleteChain, NULL ); - mlt_properties_set_data( properties, "movit input", input, 0, NULL, NULL ); - mlt_properties_set_int( properties, "_movit finalized", 0 ); + 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; @@ -241,38 +368,35 @@ void GlslManager::reset_finalized( mlt_service service ) mlt_properties_set_int( MLT_SERVICE_PROPERTIES(service), "_movit finalized", 0 ); } -Effect* GlslManager::get_effect( mlt_filter filter, mlt_frame frame ) +Effect* GlslManager::get_effect( mlt_service service, mlt_frame frame ) { - mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ); - mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); - char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" ); - return (Effect*) mlt_properties_get_data( properties, unique_id, NULL ); + Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) ); + char *unique_id = mlt_properties_get( MLT_SERVICE_PROPERTIES(service), "_unique_id" ); + return (Effect*) GlslManager::get_instance()->effect_list( producer ).get_data( unique_id ); } -Effect* GlslManager::add_effect( mlt_filter filter, mlt_frame frame, Effect* effect ) +Effect* GlslManager::add_effect( mlt_service service, mlt_frame frame, Effect* effect ) { - mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ); - mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); - char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" ); - EffectChain* chain = (EffectChain*) mlt_properties_get_data( properties, "movit chain", NULL ); + 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 ); - mlt_properties_set_data( properties, unique_id, effect, 0, NULL, NULL ); + char *unique_id = mlt_properties_get( MLT_SERVICE_PROPERTIES(service), "_unique_id" ); + GlslManager::get_instance()->effect_list( producer ).set( unique_id, effect, 0 ); return effect; } -Effect* GlslManager::add_effect( mlt_filter filter, mlt_frame frame, Effect* effect, Effect* input_b ) +Effect* GlslManager::add_effect( mlt_service service, mlt_frame frame, Effect* effect, Effect* input_b ) { - mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ); - mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer ); - char *unique_id = mlt_properties_get( MLT_FILTER_PROPERTIES(filter), "_unique_id" ); - EffectChain* chain = (EffectChain*) mlt_properties_get_data( properties, "movit chain", NULL ); + 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() ); - mlt_properties_set_data( properties, unique_id, effect, 0, NULL, NULL ); + char *unique_id = mlt_properties_get( MLT_SERVICE_PROPERTIES(service), "_unique_id" ); + GlslManager::get_instance()->effect_list( producer ).set( unique_id, effect, 0 ); return effect; } -void GlslManager::render( mlt_service service, void* chain, GLuint fbo, int width, int height ) +void GlslManager::render_fbo( mlt_service service, void* chain, GLuint fbo, int width, int height ) { EffectChain* effect_chain = (EffectChain*) chain; mlt_properties properties = MLT_SERVICE_PROPERTIES( service ); @@ -283,3 +407,143 @@ void GlslManager::render( mlt_service service, void* chain, GLuint fbo, int widt } effect_chain->render_to_fbo( fbo, width, height ); } + +int GlslManager::render_frame_texture(mlt_service service, 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 ); + if (!texture) { + release_fbo( fbo ); + return 1; + } + + glBindFramebuffer( GL_FRAMEBUFFER, fbo->fbo ); + check_error(); + glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture->texture, 0 ); + check_error(); + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + check_error(); + + 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 ); + } + render_fbo( service, chain, fbo->fbo, width, height ); + prev_sync = glFenceSync( GL_SYNC_GPU_COMMANDS_COMPLETE, 0 ); + GLsync sync = glFenceSync( GL_SYNC_GPU_COMMANDS_COMPLETE, 0 ); + + check_error(); + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + check_error(); + release_fbo( fbo ); + + *image = (uint8_t*) &texture->texture; + 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) +{ + 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 ); + if (!texture) { + release_fbo( fbo ); + return 1; + } + + // Use a PBO to hold the data we read back with glReadPixels(). + // (Intel/DRI goes into a slow path if we don't read to PBO.) + int img_size = width * height * 4; + glsl_pbo pbo = get_pbo( img_size ); + if (!pbo) { + release_fbo( fbo ); + release_texture(texture); + return 1; + } + + // Set the FBO + check_error(); + glBindFramebuffer( GL_FRAMEBUFFER, fbo->fbo ); + check_error(); + glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture->texture, 0 ); + check_error(); + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + check_error(); + + render_fbo( service, chain, fbo->fbo, width, height ); + + // Read FBO into PBO + glBindFramebuffer( GL_FRAMEBUFFER, fbo->fbo ); + check_error(); + glBindBuffer( GL_PIXEL_PACK_BUFFER_ARB, pbo->pbo ); + check_error(); + glBufferData( GL_PIXEL_PACK_BUFFER_ARB, img_size, NULL, GL_STREAM_READ ); + check_error(); + glReadPixels( 0, 0, width, height, GL_BGRA, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0) ); + check_error(); + + // Copy from PBO + uint8_t* buf = (uint8_t*) glMapBuffer( GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY ); + check_error(); + *image = (uint8_t*) mlt_pool_alloc( img_size ); + mlt_frame_set_image( frame, *image, img_size, mlt_pool_release ); + memcpy( *image, buf, img_size ); + + // Convert BGRA to RGBA + register uint8_t *p = *image; + register int n = width * height + 1; + while ( --n ) { + uint8_t b = p[0]; + *p = p[2]; p += 2; + *p = b; p += 2; + } + + // Release PBO and FBO + glUnmapBuffer( GL_PIXEL_PACK_BUFFER_ARB ); + check_error(); + glBindBuffer( GL_PIXEL_PACK_BUFFER_ARB, 0 ); + check_error(); + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + check_error(); + glBindTexture( GL_TEXTURE_2D, 0 ); + check_error(); + mlt_properties_set_data( MLT_FRAME_PROPERTIES(frame), "movit.convert.texture", texture, 0, + (mlt_destructor) GlslManager::release_texture, NULL); + release_fbo( fbo ); + + return 0; +} + +void GlslManager::lock_service( mlt_frame frame ) +{ + Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) ); + producer.lock(); +} + +void GlslManager::unlock_service( mlt_frame frame ) +{ + Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) ); + producer.unlock(); +}