#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"
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
- mlt_log_debug( 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();
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.width", output_format );
+ producer.set( "movit.convert.format", output_format );
}
}
}
}
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();
-
- GlslManager::render( service, chain, fbo->fbo, width, height );
-
- glFinish();
- check_error();
- glBindFramebuffer( GL_FRAMEBUFFER, 0 );
- check_error();
-
- *image = (uint8_t*) &texture->texture;
- mlt_frame_set_image( frame, *image, 0, NULL );
- mlt_properties_set_data( properties, "movit.convert.texture", 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();
- *image = (uint8_t*) mlt_pool_alloc( img_size );
- mlt_frame_set_image( frame, *image, img_size, mlt_pool_release );
- memcpy( *image, buf, img_size );
-
- if ( output_format == mlt_image_yuv422 || output_format == mlt_image_yuv420p ) {
- *format = mlt_image_rgb24;
- error = convert_on_cpu( frame, image, format, output_format );
- }
-
- // 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( properties, "movit.convert.texture", texture, 0,
- (mlt_destructor) GlslManager::release_texture, NULL);
-
- 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 );
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