-
/*
* producer_pixbuf.c -- raster image loader based upon gdk-pixbuf
* 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_pixbuf.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
// Get the original position of this frame
mlt_position position = mlt_properties_get_position( properties, "pixbuf_position" );
+ position += mlt_producer_get_in( producer );
// Image index
int image_idx = ( int )floor( ( double )position / ttl ) % this->count;
if ( update_cache )
{
- mlt_frame cached = mlt_frame_init( );
+ mlt_frame cached = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
mlt_properties cached_props = MLT_FRAME_PROPERTIES( cached );
mlt_properties_set_int( cached_props, "width", this->width );
mlt_properties_set_int( cached_props, "height", this->height );
// The fault is not in the design of mlt, but in the implementation of the pixbuf producer...
if ( *buffer != NULL )
{
- // Clone the image and the alpha
- uint8_t *image_copy = mlt_pool_alloc( image_size );
- uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+ if ( *format == mlt_image_yuv422 || *format == mlt_image_yuv420p )
+ {
+ // Clone the image and the alpha
+ uint8_t *image_copy = mlt_pool_alloc( image_size );
+ uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
- memcpy( image_copy, *buffer, image_size );
+ memcpy( image_copy, *buffer, image_size );
- // Copy or default the alpha
- if ( alpha != NULL )
- memcpy( alpha_copy, alpha, alpha_size );
- else
- memset( alpha_copy, 255, alpha_size );
+ // Copy or default the alpha
+ if ( alpha != NULL )
+ memcpy( alpha_copy, alpha, alpha_size );
+ else
+ memset( alpha_copy, 255, alpha_size );
+
+ // Now update properties so we free the copy after
+ mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
+
+ // We're going to pass the copy on
+ *buffer = image_copy;
+ }
+ else if ( *format == mlt_image_rgb24a )
+ {
+ // Clone the image and the alpha
+ image_size = *width * ( *height + 1 ) * 4;
+ alpha_size = *width * ( *height + 1 );
+ uint8_t *image_copy = mlt_pool_alloc( image_size );
+ uint8_t *alpha_copy = mlt_pool_alloc( alpha_size );
+
+ mlt_convert_yuv422_to_rgb24a(*buffer, image_copy, (*width)*(*height));
- // Now update properties so we free the copy after
- mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
- mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
+ // Now update properties so we free the copy after
+ mlt_properties_set_data( properties, "image", image_copy, image_size, mlt_pool_release, NULL );
+ mlt_properties_set_data( properties, "alpha", alpha_copy, alpha_size, mlt_pool_release, NULL );
+
+ // We're going to pass the copy on
+ *buffer = image_copy;
+ }
- // We're going to pass the copy on
- *buffer = image_copy;
}
else
{
if ( stat( full, &buf ) == 0 )
{
sprintf( key, "%d", keyvalue ++ );
- mlt_properties_set( this->filenames, "0", full );
+ mlt_properties_set( this->filenames, key, full );
gap = 0;
}
else
}
// Generate a frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
if ( *frame != NULL && this->count > 0 )
{
projects / melted / blobdiff