]> git.sesse.net Git - mlt/blobdiff - src/modules/core/producer_colour.c
Refactor producer color to use mlt_properties_get_color().
[mlt] / src / modules / core / producer_colour.c
index c1fa1681e3d558814e2f944b5540194a93711ccf..bb9427cc40d2783f8983739c601facce6f15fd83 100644 (file)
@@ -3,22 +3,22 @@
  * 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>
 
 #include <string.h>
 
 
-typedef struct
-{
-       uint8_t r, g, b, a;
-} rgba_color;
-
 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 )
@@ -48,7 +43,9 @@ mlt_producer producer_colour_init( char *colour )
                producer->close = ( mlt_destructor )producer_close;
 
                // Set the default properties
-               mlt_properties_set( properties, "resource", colour == NULL ? "0x000000ff" : colour );
+               mlt_properties_set( properties, "resource", ( !colour || !strcmp( colour, "" ) ) ? "0x000000ff" : colour );
+               mlt_properties_set( properties, "_resource", "" );
+               mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
                
                return producer;
        }
@@ -56,132 +53,144 @@ mlt_producer producer_colour_init( char *colour )
        return NULL;
 }
 
-rgba_color parse_color( char *color )
-{
-       rgba_color result = { 0xff, 0xff, 0xff, 0xff };
-
-       if ( strchr( color, '/' ) )
-               color = strrchr( color, '/' ) + 1;
-
-       if ( !strncmp( color, "0x", 2 ) )
-       {
-               unsigned int temp = 0;
-               sscanf( color + 2, "%x", &temp );
-               result.r = ( temp >> 24 ) & 0xff;
-               result.g = ( temp >> 16 ) & 0xff;
-               result.b = ( temp >> 8 ) & 0xff;
-               result.a = ( temp ) & 0xff;
-       }
-       else if ( !strcmp( color, "red" ) )
-       {
-               result.r = 0xff;
-               result.g = 0x00;
-               result.b = 0x00;
-       }
-       else if ( !strcmp( color, "green" ) )
-       {
-               result.r = 0x00;
-               result.g = 0xff;
-               result.b = 0x00;
-       }
-       else if ( !strcmp( color, "blue" ) )
-       {
-               result.r = 0x00;
-               result.g = 0x00;
-               result.b = 0xff;
-       }
-       else if ( strcmp( color, "white" ) )
-       {
-               unsigned int temp = 0;
-               sscanf( color, "%d", &temp );
-               result.r = ( temp >> 24 ) & 0xff;
-               result.g = ( temp >> 16 ) & 0xff;
-               result.b = ( temp >> 8 ) & 0xff;
-               result.a = ( temp ) & 0xff;
-       }
-
-       return result;
-}
-
 static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *format, int *width, int *height, int writable )
 {
-       // May need to know the size of the image to clone it
-       int size = 0;
-       
        // Obtain properties of frame
        mlt_properties properties = MLT_FRAME_PROPERTIES( frame );
 
        // Obtain the producer for this frame
        mlt_producer producer = mlt_properties_get_data( properties, "producer_colour", NULL );
 
+       mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) );
+
        // Obtain properties of producer
        mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
 
-       // Parse the colour
-       rgba_color color = parse_color( mlt_properties_get( producer_props, "resource" ) );
+       // Get the current and previous colour strings
+       char *now = mlt_properties_get( producer_props, "resource" );
+       char *then = mlt_properties_get( producer_props, "_resource" );
 
        // Get the current image and dimensions cached in the producer
+       int size = 0;
        uint8_t *image = mlt_properties_get_data( producer_props, "image", &size );
-       int current_width = mlt_properties_get_int( producer_props, "width" );
-       int current_height = mlt_properties_get_int( producer_props, "height" );
+       int current_width = mlt_properties_get_int( producer_props, "_width" );
+       int current_height = mlt_properties_get_int( producer_props, "_height" );
+       mlt_image_format current_format = mlt_properties_get_int( producer_props, "_format" );
+
+       // Parse the colour
+       if ( now && strchr( now, '/' ) )
+       {
+               now = strdup( strrchr( now, '/' ) + 1 );
+               mlt_properties_set( producer_props, "resource", now );
+               free( now );
+               now = mlt_properties_get( producer_props, "resource" );
+       }
+       mlt_color color = mlt_properties_get_color( producer_props, "resource" );
+
+       // Choose suitable out values if nothing specific requested
+       if ( *format == mlt_image_none )
+               *format = mlt_image_rgb24a;
+       if ( *width <= 0 )
+               *width = mlt_service_profile( MLT_PRODUCER_SERVICE(producer) )->width;
+       if ( *height <= 0 )
+               *height = mlt_service_profile( MLT_PRODUCER_SERVICE(producer) )->height;
 
        // See if we need to regenerate
-       if ( *width != current_width || *height != current_height )
+       if ( strcmp( now, then ) || *width != current_width || *height != current_height || *format != current_format )
        {
                // Color the image
-               uint8_t y, u, v;
-               int i = 0;
+               int i = *width * *height + 1;
+               int bpp;
 
                // Allocate the image
-               size = *width * *height * 2;
-               image = mlt_pool_alloc( size );
+               size = mlt_image_format_size( *format, *width, *height, &bpp );
+               uint8_t *p = image = mlt_pool_alloc( size );
 
                // Update the producer
                mlt_properties_set_data( producer_props, "image", image, size, mlt_pool_release, NULL );
-               mlt_properties_set_int( producer_props, "width", *width );
-               mlt_properties_set_int( producer_props, "height", *height );
+               mlt_properties_set_int( producer_props, "_width", *width );
+               mlt_properties_set_int( producer_props, "_height", *height );
+               mlt_properties_set_int( producer_props, "_format", *format );
+               mlt_properties_set( producer_props, "_resource", now );
 
-               RGB2YUV( color.r, color.g, color.b, y, u, v );
+               mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
 
-               while ( i < size )
+               switch ( *format )
+               {
+               case mlt_image_yuv422:
                {
-                       image[ i ++ ] = y;
-                       image[ i ++ ] = u;
-                       image[ i ++ ] = y;
-                       image[ i ++ ] = v;
+                       int uneven = *width % 2;
+                       int count = ( *width - uneven ) / 2 + 1;
+                       uint8_t y, u, v;
+
+                       RGB2YUV_601_SCALED( color.r, color.g, color.b, y, u, v );
+                       i = *height + 1;
+                       while ( --i )
+                       {
+                               int j = count;
+                               while ( --j )
+                               {
+                                       *p ++ = y;
+                                       *p ++ = u;
+                                       *p ++ = y;
+                                       *p ++ = v;
+                               }
+                               if ( uneven )
+                               {
+                                       *p ++ = y;
+                                       *p ++ = u;
+                               }
+                       }
+                       break;
+               }
+               case mlt_image_rgb24:
+                       while ( --i )
+                       {
+                               *p ++ = color.r;
+                               *p ++ = color.g;
+                               *p ++ = color.b;
+                       }
+                       break;
+               case mlt_image_glsl:
+               case mlt_image_glsl_texture:
+                       memset(p, 0, size);
+                       break;
+               default:
+                       *format = mlt_image_rgb24a;
+                       while ( --i )
+                       {
+                               *p ++ = color.r;
+                               *p ++ = color.g;
+                               *p ++ = color.b;
+                               *p ++ = color.a;
+                       }
+                       break;
                }
        }
-
-       // Update the frame
-       mlt_properties_set_data( properties, "image", image, size, NULL, NULL );
-       mlt_properties_set_int( properties, "width", *width );
-       mlt_properties_set_int( properties, "height", *height );
-       
-       // Clone if necessary
-       if ( writable )
+       else
        {
-               // Create the alpha channel
-               uint8_t *alpha = mlt_pool_alloc( size >> 1 );
+               mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
+       }
 
-               // Clone our image
-               uint8_t *copy = mlt_pool_alloc( size );
-               memcpy( copy, image, size );
+       // Create the alpha channel
+       int alpha_size = *width * *height;
+       uint8_t *alpha = mlt_pool_alloc( alpha_size );
 
-               // We're going to pass the copy on
-               image = copy;
+       // Initialise the alpha
+       if ( alpha )
+               memset( alpha, color.a, alpha_size );
 
-               // Initialise the alpha
-               if ( alpha )
-                       memset( alpha, color.a, size >> 1 );
+       // Clone our image
+       *buffer = mlt_pool_alloc( size );
+       memcpy( *buffer, image, size );
 
-               // 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 );
-       }
+       // Now update properties so we free the copy after
+       mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
+       mlt_frame_set_alpha( frame, alpha, alpha_size, mlt_pool_release );
+       mlt_properties_set_double( properties, "aspect_ratio", mlt_properties_get_double( producer_props, "aspect_ratio" ) );
+       mlt_properties_set_int( properties, "meta.media.width", *width );
+       mlt_properties_set_int( properties, "meta.media.height", *height );
 
-       // Pass on the image
-       *buffer = image;
-       *format = mlt_image_yuv422;
 
        return 0;
 }
@@ -189,7 +198,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 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 )
        {
@@ -199,9 +208,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                // Obtain properties of producer
                mlt_properties producer_props = MLT_PRODUCER_PROPERTIES( producer );
 
-               // Determine if we're producing PAL or NTSC
-               int is_pal = mlt_properties_get_double( producer_props, "fps" ) == 25.0;
-
                // Set the producer on the frame properties
                mlt_properties_set_data( properties, "producer_colour", producer, 0, NULL, NULL );
 
@@ -210,7 +216,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 
                // Set producer-specific frame properties
                mlt_properties_set_int( properties, "progressive", 1 );
-               mlt_properties_set_double( properties, "aspect_ratio", is_pal ? 59.0/54.0 : 10.0/11.0 );
+               mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) );
+               mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
 
                // colour is an alias for resource
                if ( mlt_properties_get( producer_props, "colour" ) != NULL )