#include <stdlib.h>
#include <assert.h>
-#include "glsl_manager.h"
+#include "filter_glsl_manager.h"
#include <movit/effect_chain.h>
#include <movit/util.h>
#include "mlt_movit_input.h"
-
+#include <mlt++/MltProducer.h>
+#include "mlt_flip_effect.h"
static void yuv422_to_yuv422p( uint8_t *yuv422, uint8_t *yuv422p, int width, int height )
{
return error;
}
+static void delete_chain( EffectChain* chain )
+{
+ delete chain;
+}
+
+static void get_format_from_properties( mlt_properties properties, ImageFormat* image_format, YCbCrFormat* ycbcr_format )
+{
+ switch ( mlt_properties_get_int( properties, "colorspace" ) ) {
+ case 601:
+ ycbcr_format->luma_coefficients = YCBCR_REC_601;
+ break;
+ case 709:
+ default:
+ ycbcr_format->luma_coefficients = YCBCR_REC_709;
+ break;
+ }
+
+ switch ( mlt_properties_get_int( properties, "color_primaries" ) ) {
+ case 601625:
+ image_format->color_space = COLORSPACE_REC_601_625;
+ break;
+ case 601525:
+ image_format->color_space = COLORSPACE_REC_601_525;
+ break;
+ case 709:
+ default:
+ image_format->color_space = COLORSPACE_REC_709;
+ break;
+ }
+
+ image_format->gamma_curve = GAMMA_REC_709;
+
+ if ( mlt_properties_get_int( properties, "force_full_luma" ) ) {
+ ycbcr_format->full_range = true;
+ } else {
+ ycbcr_format->full_range = ( mlt_properties_get_int( properties, "full_luma" ) == 1 );
+ }
+
+ // TODO: make new frame properties set by producers
+ ycbcr_format->cb_x_position = ycbcr_format->cr_x_position = 0.0f;
+ ycbcr_format->cb_y_position = ycbcr_format->cr_y_position = 0.5f;
+}
+
static int convert_image( mlt_frame frame, uint8_t **image, mlt_image_format *format, mlt_image_format output_format )
{
// Nothing to do!
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- mlt_log_verbose( NULL, "filter_movit_convert: %s -> %s\n",
- mlt_image_format_name( *format ), mlt_image_format_name( output_format ) );
+ mlt_log_debug( NULL, "filter_movit_convert: %s -> %s (%d)\n",
+ mlt_image_format_name( *format ), mlt_image_format_name( output_format ),
+ mlt_frame_get_position( frame ) );
// Use CPU if glsl not initialized or not supported.
GlslManager* glsl = GlslManager::get_instance();
int img_size = mlt_image_format_size( *format, width, height, NULL );
mlt_producer producer = mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) );
mlt_service service = MLT_PRODUCER_SERVICE(producer);
+ GlslManager::get_instance()->lock_service( frame );
EffectChain* chain = GlslManager::get_chain( service );
MltInput* input = GlslManager::get_input( service );
- // Use a temporary chain to convert image in RAM to OpenGL texture.
- if ( output_format == mlt_image_glsl_texture && *format != mlt_image_glsl ) {
- input = new MltInput( width, height );
- chain = new EffectChain( width, height );
- chain->add_input( input );
+ if ( !chain || !input ) {
+ GlslManager::get_instance()->unlock_service( frame );
+ return 2;
}
if ( *format != mlt_image_glsl ) {
+ bool finalize_chain = false;
+ if ( output_format == mlt_image_glsl_texture ) {
+ // We might already have a texture from a previous conversion from mlt_image_glsl.
+ glsl_texture texture = (glsl_texture) mlt_properties_get_data( properties, "movit.convert.texture", NULL );
+ // XXX: requires a special property set on the frame by the app for now
+ // because we do not have reliable way to clear the texture property
+ // when a downstream filter has changed image.
+ if ( texture && mlt_properties_get_int( properties, "movit.convert.use_texture") ) {
+ *image = (uint8_t*) &texture->texture;
+ mlt_frame_set_image( frame, *image, 0, NULL );
+ mlt_properties_set_int( properties, "format", output_format );
+ *format = output_format;
+ GlslManager::get_instance()->unlock_service( frame );
+ return error;
+ } else {
+ // Use a separate chain to convert image in RAM to OpenGL texture.
+ // Use cached chain if available and compatible.
+ Mlt::Producer producer( mlt_producer_cut_parent( mlt_frame_get_original_producer( frame ) ) );
+ chain = (EffectChain*) producer.get_data( "movit.convert.chain" );
+ input = (MltInput*) producer.get_data( "movit.convert.input" );
+ int w = producer.get_int( "movit.convert.width" );
+ int h = producer.get_int( "movit.convert.height" );
+ mlt_image_format f = (mlt_image_format) producer.get_int( "movit.convert.format" );
+ if ( !chain || width != w || height != h || output_format != f ) {
+ chain = new EffectChain( width, height );
+ input = new MltInput( width, height );
+ chain->add_input( input );
+ chain->add_effect( new Mlt::VerticalFlip() );
+ finalize_chain = true;
+ producer.set( "movit.convert.chain", chain, 0, (mlt_destructor) delete_chain );
+ producer.set( "movit.convert.input", input, 0 );
+ producer.set( "movit.convert.width", width );
+ producer.set( "movit.convert.height", height );
+ producer.set( "movit.convert.format", output_format );
+ }
+ }
+ }
if ( *format == mlt_image_rgb24a || *format == mlt_image_opengl ) {
+ // TODO: Get the color space if available.
input->useFlatInput( chain, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, width, height );
input->set_pixel_data( *image );
}
else if ( *format == mlt_image_rgb24 ) {
+ // TODO: Get the color space if available.
input->useFlatInput( chain, FORMAT_RGB, width, height );
input->set_pixel_data( *image );
}
else if ( *format == mlt_image_yuv420p ) {
ImageFormat image_format;
YCbCrFormat ycbcr_format;
- if ( 709 == mlt_properties_get_int( properties, "colorspace" ) ) {
- image_format.color_space = COLORSPACE_REC_709;
- image_format.gamma_curve = GAMMA_REC_709;
- ycbcr_format.luma_coefficients = YCBCR_REC_709;
- } else if ( 576 == mlt_properties_get_int( properties, "height" ) ) {
- image_format.color_space = COLORSPACE_REC_601_625;
- image_format.gamma_curve = GAMMA_REC_601;
- ycbcr_format.luma_coefficients = YCBCR_REC_601;
- } else {
- image_format.color_space = COLORSPACE_REC_601_525;
- image_format.gamma_curve = GAMMA_REC_601;
- ycbcr_format.luma_coefficients = YCBCR_REC_601;
- }
- ycbcr_format.full_range = mlt_properties_get_int( properties, "force_full_luma" );
+ get_format_from_properties( properties, &image_format, &ycbcr_format );
ycbcr_format.chroma_subsampling_x = ycbcr_format.chroma_subsampling_y = 2;
- // TODO: make new frame properties set by producers
- ycbcr_format.cb_x_position = ycbcr_format.cr_x_position = 0.0f;
- ycbcr_format.cb_y_position = ycbcr_format.cr_y_position = 0.5f;
input->useYCbCrInput( chain, image_format, ycbcr_format, width, height );
input->set_pixel_data( *image );
}
else if ( *format == mlt_image_yuv422 ) {
ImageFormat image_format;
YCbCrFormat ycbcr_format;
- if ( 709 == mlt_properties_get_int( properties, "colorspace" ) ) {
- image_format.color_space = COLORSPACE_REC_709;
- image_format.gamma_curve = GAMMA_REC_709;
- ycbcr_format.luma_coefficients = YCBCR_REC_709;
- } else if ( 576 == height ) {
- image_format.color_space = COLORSPACE_REC_601_625;
- image_format.gamma_curve = GAMMA_REC_601;
- ycbcr_format.luma_coefficients = YCBCR_REC_601;
- } else {
- image_format.color_space = COLORSPACE_REC_601_525;
- image_format.gamma_curve = GAMMA_REC_601;
- ycbcr_format.luma_coefficients = YCBCR_REC_601;
- }
- ycbcr_format.full_range = mlt_properties_get_int( properties, "force_full_luma" );
+ get_format_from_properties( properties, &image_format, &ycbcr_format );
ycbcr_format.chroma_subsampling_x = 2;
ycbcr_format.chroma_subsampling_y = 1;
- // TODO: make new frame properties set by producers
- ycbcr_format.cb_x_position = ycbcr_format.cr_x_position = 0.0f;
- ycbcr_format.cb_y_position = ycbcr_format.cr_y_position = 0.5f;
input->useYCbCrInput( chain, image_format, ycbcr_format, width, height );
// convert chunky to planar
input->set_pixel_data( planar );
mlt_frame_set_image( frame, planar, img_size, mlt_pool_release );
}
+ // Finalize the separate conversion chain if needed.
+ if ( finalize_chain )
+ chain->finalize();
}
if ( output_format != mlt_image_glsl ) {
- glsl_fbo fbo = glsl->get_fbo( width, height );
if ( output_format == mlt_image_glsl_texture ) {
- glsl_texture texture = glsl->get_texture( width, height, GL_RGBA );
-
- 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();
-
- // Using a temporary chain to convert image in RAM to OpenGL texture.
- if ( *format != mlt_image_glsl )
- GlslManager::reset_finalized( service );
- GlslManager::render( service, chain, fbo->fbo, width, height );
-
- glFinish();
- check_error();
- glBindFramebuffer( GL_FRAMEBUFFER, 0 );
- check_error();
- // Using a temporary chain to convert image in RAM to OpenGL texture.
- if ( *format != mlt_image_glsl )
- delete chain;
-
- *image = (uint8_t*) &texture->texture;
- mlt_frame_set_image( frame, *image, 0, NULL );
- mlt_properties_set_data( properties, "movit.convert", texture, 0,
- (mlt_destructor) GlslManager::release_texture, NULL );
- mlt_properties_set_int( properties, "format", output_format );
- *format = output_format;
+ error = glsl->render_frame_texture( service, frame, width, height, image );
}
else {
- // 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)
- GLenum gl_format = ( output_format == mlt_image_rgb24a || output_format == mlt_image_opengl )?
- GL_RGBA : GL_RGB;
- img_size = width * height * ( gl_format == GL_RGB? 3 : 4 );
- glsl_pbo pbo = glsl->get_pbo( img_size );
- glsl_texture texture = glsl->get_texture( width, height, gl_format );
-
- if ( fbo && pbo && texture ) {
- // Set the FBO
- 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();
-
- GlslManager::render( service, chain, fbo->fbo, width, height );
-
- // Read FBO into PBO
- 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_format, 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();
-
- if ( output_format == mlt_image_yuv422 || output_format == mlt_image_yuv420p ) {
- *image = buf;
- *format = mlt_image_rgb24;
- error = convert_on_cpu( frame, image, format, output_format );
- }
- else {
- *image = (uint8_t*) mlt_pool_alloc( img_size );
- mlt_frame_set_image( frame, *image, img_size, mlt_pool_release );
- memcpy( *image, buf, img_size );
- }
-
- // 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();
- GlslManager::release_texture( texture );
-
- mlt_properties_set_int( properties, "format", output_format );
- *format = output_format;
- }
- else {
- error = 1;
+ error = glsl->render_frame_rgba( service, frame, width, height, image );
+ if ( !error && output_format != mlt_image_rgb24a ) {
+ *format = mlt_image_rgb24a;
+ error = convert_on_cpu( frame, image, format, output_format );
}
}
- if ( fbo ) GlslManager::release_fbo( fbo );
+ mlt_properties_set_int( properties, "format", output_format );
+ *format = output_format;
}
else {
mlt_properties_set_int( properties, "format", output_format );
*format = output_format;
}
+ GlslManager::get_instance()->unlock_service( frame );
return error;
}
return frame;
}
-static mlt_filter create_filter( mlt_profile profile, char *effect )
+static mlt_filter create_filter( mlt_profile profile, const char *effect )
{
- mlt_filter filter = NULL;
+ mlt_filter filter;
char *id = strdup( effect );
char *arg = strchr( id, ':' );
if ( arg != NULL )
// The swscale and avcolor_space filters require resolution as arg to test compatibility
if ( !strcmp( effect, "avcolor_space" ) )
- arg = (char*) profile->width;
-
- filter = mlt_factory_filter( profile, id, arg );
+ filter = mlt_factory_filter( profile, id, &profile->width );
+ else
+ filter = mlt_factory_filter( profile, id, arg );
if ( filter )
mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 );
free( id );
if ( glsl && ( filter = mlt_filter_new() ) )
{
+#ifdef WIN32
+ // XXX avcolor_space is crashing on Windows in this context!
+ mlt_filter cpu_csc = NULL;
+#else
mlt_filter cpu_csc = create_filter( profile, "avcolor_space" );
+#endif
if ( !cpu_csc )
cpu_csc = create_filter( profile, "imageconvert" );
if ( cpu_csc )
projects / mlt / blobdiff