* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Dan Dennedy <dan@dennedy.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "producer_pango.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
+#include <framework/mlt_geometry.h>
#include <stdlib.h>
#include <string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangoft2.h>
#include <freetype/freetype.h>
#include <iconv.h>
+#include <pthread.h>
+#include <ctype.h>
+
+typedef struct producer_pango_s *producer_pango;
+
+typedef enum
+{
+ pango_align_left = 0,
+ pango_align_center,
+ pango_align_right
+} pango_align;
+
+static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER;
struct producer_pango_s
{
struct mlt_producer_s parent;
- int width;
- int height;
- uint8_t *image;
- uint8_t *alpha;
+ int width;
+ int height;
+ GdkPixbuf *pixbuf;
char *fgcolor;
char *bgcolor;
int align;
char *markup;
char *text;
char *font;
- int weight;
+ int weight;
};
// special color type used by internal pango routines
{
mlt_producer producer = &this->parent;
- // THIS SHOULD BE MUTEXED...
+ pthread_mutex_lock( &pango_mutex );
if ( fontmap == NULL )
fontmap = (PangoFT2FontMap*) pango_ft2_font_map_new();
+ g_type_init();
+ pthread_mutex_unlock( &pango_mutex );
producer->get_frame = producer_get_frame;
producer->close = ( mlt_destructor )producer_close;
- // This is required to initialise gdk-pixbuf
- g_type_init();
-
// Get the properties interface
mlt_properties properties = MLT_PRODUCER_PROPERTIES( &this->parent );
( *strrchr( markup, '.' ) ) = '\0';
while ( strchr( markup, '~' ) )
( *strchr( markup, '~' ) ) = '\n';
- mlt_properties_set( properties, "resource", ( char * )filename );
+ mlt_properties_set( properties, "resource", filename );
mlt_properties_set( properties, "markup", markup );
free( copy );
}
+ else if ( strstr( filename, ".mpl" ) )
+ {
+ int i = 0;
+ mlt_properties contents = mlt_properties_load( filename );
+ mlt_geometry key_frames = mlt_geometry_init( );
+ struct mlt_geometry_item_s item;
+ mlt_properties_set( properties, "resource", filename );
+ mlt_properties_set_data( properties, "contents", contents, 0, ( mlt_destructor )mlt_properties_close, NULL );
+ mlt_properties_set_data( properties, "key_frames", key_frames, 0, ( mlt_destructor )mlt_geometry_close, NULL );
+
+ // Make sure we have at least one entry
+ if ( mlt_properties_get( contents, "0" ) == NULL )
+ mlt_properties_set( contents, "0", "" );
+
+ for ( i = 0; i < mlt_properties_count( contents ); i ++ )
+ {
+ char *name = mlt_properties_get_name( contents, i );
+ char *value = mlt_properties_get_value( contents, i );
+ while ( value != NULL && strchr( value, '~' ) )
+ ( *strchr( value, '~' ) ) = '\n';
+ item.frame = atoi( name );
+ mlt_geometry_insert( key_frames, &item );
+ }
+ }
else
{
FILE *f = fopen( filename, "r" );
if ( markup[ strlen( markup ) - 1 ] == '\n' )
markup[ strlen( markup ) - 1 ] = '\0';
- mlt_properties_set( properties, "resource", ( char * ) filename );
- mlt_properties_set( properties, "markup", ( char * ) ( markup == NULL ? "" : markup ) );
+ mlt_properties_set( properties, "resource", filename );
+ mlt_properties_set( properties, "markup", ( markup == NULL ? "" : markup ) );
free( markup );
}
else
return NULL;
}
-static void set_string( char **string, char *value, char *fallback )
+static void set_string( char **string, const char *value, const char *fallback )
{
if ( value != NULL )
{
/** Convert a string property to UTF-8
*/
-static int iconv_utf8( mlt_properties properties, char *prop_name, const char* encoding )
+static int iconv_utf8( mlt_properties properties, const char *prop_name, const char* encoding )
{
char *text = mlt_properties_get( properties, prop_name );
int result = -1;
static void refresh_image( mlt_frame frame, int width, int height )
{
- // Pixbuf
- GdkPixbuf *pixbuf = NULL;
+ // Pixbuf
+ GdkPixbuf *pixbuf = mlt_properties_get_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", NULL );
// Obtain properties of frame
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
char *encoding = mlt_properties_get( producer_props, "encoding" );
int weight = mlt_properties_get_int( producer_props, "weight" );
int size = mlt_properties_get_int( producer_props, "size" );
+ int property_changed = 0;
+
+ if ( pixbuf == NULL )
+ {
+ // Check for file support
+ int position = mlt_properties_get_position( properties, "pango_position" );
+ mlt_properties contents = mlt_properties_get_data( producer_props, "contents", NULL );
+ mlt_geometry key_frames = mlt_properties_get_data( producer_props, "key_frames", NULL );
+ struct mlt_geometry_item_s item;
+ if ( contents != NULL )
+ {
+ char temp[ 20 ];
+ mlt_geometry_prev_key( key_frames, &item, position );
+ sprintf( temp, "%d", item.frame );
+ markup = mlt_properties_get( contents, temp );
+ }
- // See if any properties changed
- int property_changed = ( align != this->align );
- property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
- property_changed = property_changed || ( this->bgcolor == NULL || ( bg && strcmp( bg, this->bgcolor ) ) );
- property_changed = property_changed || ( pad != this->pad );
- property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
- property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
- property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
- property_changed = property_changed || ( weight != this->weight );
-
- // Save the properties for next comparison
- this->align = align;
- this->pad = pad;
- set_string( &this->fgcolor, fg, "0xffffffff" );
- set_string( &this->bgcolor, bg, "0x00000000" );
- set_string( &this->markup, markup, NULL );
- set_string( &this->text, text, NULL );
- set_string( &this->font, font, "Sans 48" );
- this->weight = weight;
-
- if ( property_changed )
+ // See if any properties changed
+ property_changed = ( align != this->align );
+ property_changed = property_changed || ( this->fgcolor == NULL || ( fg && strcmp( fg, this->fgcolor ) ) );
+ property_changed = property_changed || ( this->bgcolor == NULL || ( bg && strcmp( bg, this->bgcolor ) ) );
+ property_changed = property_changed || ( pad != this->pad );
+ property_changed = property_changed || ( markup && this->markup && strcmp( markup, this->markup ) );
+ property_changed = property_changed || ( text && this->text && strcmp( text, this->text ) );
+ property_changed = property_changed || ( font && this->font && strcmp( font, this->font ) );
+ property_changed = property_changed || ( weight != this->weight );
+
+ // Save the properties for next comparison
+ this->align = align;
+ this->pad = pad;
+ set_string( &this->fgcolor, fg, "0xffffffff" );
+ set_string( &this->bgcolor, bg, "0x00000000" );
+ set_string( &this->markup, markup, NULL );
+ set_string( &this->text, text, NULL );
+ set_string( &this->font, font, "Sans 48" );
+ this->weight = weight;
+ }
+
+ if ( pixbuf == NULL && property_changed )
{
rgba_color fgcolor = parse_color( this->fgcolor );
rgba_color bgcolor = parse_color( this->bgcolor );
- mlt_pool_release( this->image );
- mlt_pool_release( this->alpha );
- this->image = NULL;
- this->alpha = NULL;
+ if ( this->pixbuf )
+ g_object_unref( this->pixbuf );
+ this->pixbuf = NULL;
// Convert from specified encoding to UTF-8
if ( encoding != NULL && !strncaseeq( encoding, "utf-8", 5 ) && !strncaseeq( encoding, "utf8", 4 ) )
{
// Register this pixbuf for destruction and reuse
mlt_properties_set_data( producer_props, "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
+ g_object_ref( pixbuf );
+ mlt_properties_set_data( MLT_FRAME_PROPERTIES( frame ), "pixbuf", pixbuf, 0, ( mlt_destructor )g_object_unref, NULL );
mlt_properties_set_int( producer_props, "real_width", gdk_pixbuf_get_width( pixbuf ) );
mlt_properties_set_int( producer_props, "real_height", gdk_pixbuf_get_height( pixbuf ) );
this->height = gdk_pixbuf_get_height( pixbuf );
}
}
- else if ( width > 0 && ( this->image == NULL || width != this->width || height != this->height ) )
+ else if ( pixbuf == NULL && width > 0 && ( this->pixbuf == NULL || width != this->width || height != this->height ) )
{
- mlt_pool_release( this->image );
- mlt_pool_release( this->alpha );
- this->image = NULL;
- this->alpha = NULL;
-
+ if ( this->pixbuf )
+ g_object_unref( this->pixbuf );
+ this->pixbuf = NULL;
pixbuf = mlt_properties_get_data( producer_props, "pixbuf", NULL );
}
interp = GDK_INTERP_NEAREST;
else if ( strcmp( interps, "tiles" ) == 0 )
interp = GDK_INTERP_TILES;
- else if ( strcmp( interps, "hyper" ) == 0 )
+ else if ( strcmp( interps, "hyper" ) == 0 || strcmp( interps, "bicubic" ) == 0 )
interp = GDK_INTERP_HYPER;
-// fprintf( stderr, "SCALING PANGO from %dx%d to %dx%d was %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height, this->width, this->height );
-
+// fprintf(stderr,"%s: scaling from %dx%d to %dx%d\n", __FILE__, this->width, this->height, width, height);
+
// Note - the original pixbuf is already safe and ready for destruction
- pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
+ this->pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
// Store width and height
this->width = width;
this->height = height;
-
- // Allocate/define image
- this->image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
- this->alpha = mlt_pool_alloc( this->width * this->height );
-
- // Convert the image
- mlt_convert_rgb24a_to_yuv422( gdk_pixbuf_get_pixels( pixbuf ),
- this->width, this->height,
- gdk_pixbuf_get_rowstride( pixbuf ),
- this->image, this->alpha );
-
- // Finished with pixbuf now
- g_object_unref( pixbuf );
}
// Set width/height
mlt_properties_set_int( properties, "height", this->height );
mlt_properties_set_int( properties, "real_width", mlt_properties_get_int( producer_props, "real_width" ) );
mlt_properties_set_int( properties, "real_height", mlt_properties_get_int( producer_props, "real_height" ) );
-
- // pass the image data without destructor
- mlt_properties_set_data( properties, "image", this->image, this->width * ( this->height + 1 ) * 2, NULL, NULL );
- mlt_properties_set_data( properties, "alpha", this->alpha, this->width * this->height, NULL, NULL );
}
static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
{
+ int error = 0;
+ producer_pango this = ( producer_pango ) mlt_frame_pop_service( frame );
+
// Obtain properties of frame
mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
*width = mlt_properties_get_int( properties, "rescale_width" );
*height = mlt_properties_get_int( properties, "rescale_height" );
+ mlt_service_lock( MLT_PRODUCER_SERVICE( &this->parent ) );
+
// Refresh the image
+ pthread_mutex_lock( &pango_mutex );
refresh_image( frame, *width, *height );
- // Determine format
- //mlt_producer this = mlt_properties_get_data( properties, "producer_pango", NULL );
- //*format = ( mlt_properties_get_int( MLT_PRODUCER_PROPERTIES( this ), "bpp" ) == 4 ) ? mlt_image_rgb24a : mlt_image_rgb24;
-
- // May need to know the size of the image to clone it
- int size = 0;
-
- // Get the image
- uint8_t *image = mlt_properties_get_data( properties, "image", &size );
-
// Get width and height
- *width = mlt_properties_get_int( properties, "width" );
- *height = mlt_properties_get_int( properties, "height" );
+ *width = this->width;
+ *height = this->height;
- // Clone if necessary
- if ( writable )
+ // Always clone here to allow 'animated' text
+ if ( this->pixbuf )
{
- // Clone our image
- uint8_t *copy = mlt_pool_alloc( size );
- if ( copy != NULL && image != NULL )
- memcpy( copy, image, size );
-
- // We're going to pass the copy on
- image = copy;
+ // Clone the image
+ int image_size = this->width * this->height * 4;
+ *buffer = mlt_pool_alloc( image_size );
+ memcpy( *buffer, gdk_pixbuf_get_pixels( this->pixbuf ), image_size );
// Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", copy, size, ( mlt_destructor )mlt_pool_release, NULL );
+ mlt_frame_set_image( frame, *buffer, image_size, mlt_pool_release );
+ *format = mlt_image_rgb24a;
+ }
+ else
+ {
+ error = 1;
}
- // Pass on the image
- *buffer = image;
-
- return 0;
-}
-
-static uint8_t *producer_get_alpha_mask( mlt_frame this )
-{
- // Obtain properties of frame
- mlt_properties properties = MLT_FRAME_PROPERTIES( this );
+ pthread_mutex_unlock( &pango_mutex );
+ mlt_service_unlock( MLT_PRODUCER_SERVICE( &this->parent ) );
- // Return the alpha mask
- return mlt_properties_get_data( properties, "alpha", NULL );
+ return error;
}
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
producer_pango this = producer->child;
// Generate a frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
// Obtain properties of frame and producer
mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
// Set the producer on the frame properties
mlt_properties_set_data( properties, "producer_pango", this, 0, NULL, NULL );
+ // Update timecode on the frame we're creating
+ mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
+ mlt_properties_set_position( properties, "pango_position", mlt_producer_frame( producer ) );
+
// Refresh the pango image
+ pthread_mutex_lock( &pango_mutex );
refresh_image( *frame, 0, 0 );
+ pthread_mutex_unlock( &pango_mutex );
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", 0 );
-
- // Set alpha call back
- ( *frame )->get_alpha_mask = producer_get_alpha_mask;
+ mlt_properties_set_double( properties, "aspect_ratio", 1 );
// Stack the get image callback
+ mlt_frame_push_service( *frame, this );
mlt_frame_push_get_image( *frame, producer_get_image );
- // Update timecode on the frame we're creating
- mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
-
// Calculate the next timecode
mlt_producer_prepare_next( producer );
static void producer_close( mlt_producer parent )
{
producer_pango this = parent->child;
- mlt_pool_release( this->image );
- mlt_pool_release( this->alpha );
+ if ( this->pixbuf )
+ g_object_unref( this->pixbuf );
free( this->fgcolor );
free( this->bgcolor );
free( this->markup );
pango_layout_set_width( layout, -1 ); // set wrapping constraints
pango_font_description_set_weight( desc, ( PangoWeight ) weight );
if ( size != 0 )
- pango_font_description_set_size( desc, PANGO_SCALE * size );
+ pango_font_description_set_absolute_size( desc, PANGO_SCALE * size );
pango_layout_set_font_description( layout, desc );
// pango_layout_set_spacing( layout, space );
pango_layout_set_alignment( layout, ( PangoAlignment ) align );
if ( markup != NULL && strcmp( markup, "" ) != 0 )
+ {
pango_layout_set_markup( layout, markup, strlen( markup ) );
+ }
else if ( text != NULL && strcmp( text, "" ) != 0 )
- pango_layout_set_text( layout, text, strlen( text ) );
+ {
+ // Replace all ~'s with a line feed (silly convention, but handy)
+ char *copy = strdup( text );
+ while ( strchr( copy, '~' ) )
+ ( *strchr( copy, '~' ) ) = '\n';
+ pango_layout_set_text( layout, copy, strlen( copy ) );
+ free( copy );
+ }
else
+ {
+ // Pango doesn't like empty strings
pango_layout_set_text( layout, " ", 2 );
+ }
pango_layout_get_pixel_size( layout, &w, &h );
+ // Interpret size property as an absolute pixel height and compensate for
+ // freetype's "interpretation" of our absolute size request. This gives
+ // precise control over compositing and better quality by reducing scaling
+ // artifacts with composite geometries that constrain the dimensions.
+ // If you do not want this, then put the size in the font property or in
+ // the pango markup.
+ if ( size != 0 )
+ {
+ pango_font_description_set_absolute_size( desc, PANGO_SCALE * size * size/h );
+ pango_layout_set_font_description( layout, desc );
+ pango_layout_get_pixel_size( layout, &w, &h );
+ }
+
+ if ( pad == 0 )
+ pad = 1;
+
pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad );
pango_draw_background( pixbuf, bg );
projects / mlt / blobdiff