* 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_colour.h"
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
#include <framework/mlt_pool.h>
static int producer_get_frame( mlt_producer parent, mlt_frame_ptr frame, int index );
static void producer_close( mlt_producer parent );
-mlt_producer producer_colour_init( char *colour )
+mlt_producer producer_colour_init( mlt_profile profile, mlt_service_type type, const char *id, char *colour )
{
mlt_producer producer = calloc( 1, sizeof( struct mlt_producer_s ) );
if ( producer != NULL && mlt_producer_init( producer, NULL ) == 0 )
// Set the default properties
mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
mlt_properties_set( properties, "_resource", "" );
+ mlt_properties_set_double( properties, "aspect_ratio", 0 );
return producer;
}
{
// Color the image
uint8_t y, u, v;
- int i = 0;
+ int i = *height;
+ int j = 0;
+ int uneven = *width % 2;
+ int count = ( *width - uneven ) / 2;
+ uint8_t *p = NULL;
// Allocate the image
size = *width * *height * 2;
RGB2YUV( color.r, color.g, color.b, y, u, v );
- while ( i < size )
+ p = image;
+
+ while ( i -- )
{
- image[ i ++ ] = y;
- image[ i ++ ] = u;
- image[ i ++ ] = y;
- image[ i ++ ] = v;
+ j = count;
+ while ( j -- )
+ {
+ *p ++ = y;
+ *p ++ = u;
+ *p ++ = y;
+ *p ++ = v;
+ }
+ if ( uneven )
+ {
+ *p ++ = y;
+ *p ++ = u;
+ }
}
}
// Now update properties so we free the copy after
mlt_properties_set_data( properties, "image", copy, size, mlt_pool_release, NULL );
mlt_properties_set_data( properties, "alpha", alpha, size >> 1, mlt_pool_release, NULL );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
}
// Pass on the image
static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index )
{
// Generate a frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
if ( *frame != NULL )
{
// Set producer-specific frame properties
mlt_properties_set_int( properties, "progressive", 1 );
- mlt_properties_set_double( properties, "aspect_ratio", 0 );
+ mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
// colour is an alias for resource
if ( mlt_properties_get( producer_props, "colour" ) != NULL )