transition region

[melted] / src / framework / mlt_properties.c

diff --git a/src/framework/mlt_properties.c b/src/framework/mlt_properties.c
index dbce362..2824cca 100644 (file)
--- a/src/framework/mlt_properties.c
+++ b/src/framework/mlt_properties.c
@@ -33,6 +33,7 @@
 
 typedef struct
 {
+       int hash[ 199 ];
        char **name;
        mlt_property *value;
        int count;
@@ -72,6 +73,15 @@ mlt_properties mlt_properties_new( )
        return this;
 }
 
+static inline int generate_hash( char *name )
+{
+       int hash = 0;
+       int i = 1;
+       while ( *name )
+               hash = ( hash + ( i ++ * ( *name ++ & 31 ) ) ) % 199;
+       return hash;
+}
+
 /** Special case - when a container (such as fezzik) is protecting another 
        producer, we need to ensure that properties are passed through to the
        real producer.
@@ -105,30 +115,59 @@ void mlt_properties_mirror( mlt_properties this, mlt_properties that )
 int mlt_properties_inherit( mlt_properties this, mlt_properties that )
 {
        int count = mlt_properties_count( that );
-       while ( count -- )
+       int i = 0;
+       for ( i = 0; i < count; i ++ )
        {
-               char *value = mlt_properties_get_value( that, count );
+               char *value = mlt_properties_get_value( that, i );
                if ( value != NULL )
                {
-                       char *name = mlt_properties_get_name( that, count );
+                       char *name = mlt_properties_get_name( that, i );
                        mlt_properties_set( this, name, value );
                }
        }
        return 0;
 }
 
+/** Pass all properties from 'that' that match the prefix to 'this' (excluding the prefix).
+*/
+
+int mlt_properties_pass( mlt_properties this, mlt_properties that, char *prefix )
+{
+       int count = mlt_properties_count( that );
+       int length = strlen( prefix );
+       int i = 0;
+       for ( i = 0; i < count; i ++ )
+       {
+               char *name = mlt_properties_get_name( that, i );
+               if ( !strncmp( name, prefix, length ) )
+               {
+                       char *value = mlt_properties_get_value( that, i );
+                       if ( value != NULL )
+                               mlt_properties_set( this, name + length, value );
+               }
+       }
+       return 0;
+}
+
 /** Locate a property by name
 */
 
-static mlt_property mlt_properties_find( mlt_properties this, char *name )
+static inline mlt_property mlt_properties_find( mlt_properties this, char *name )
 {
-       mlt_property value = NULL;
        property_list *list = this->private;
-       int i = 0;
+       mlt_property value = NULL;
+       int key = generate_hash( name );
+       int i = list->hash[ key ];
+
+       // Check if we're hashed
+       if ( list->count > 0 &&
+                name[ 0 ] == list->name[ i ][ 0 ] && 
+                !strcmp( list->name[ i ], name ) )
+               value = list->value[ i ];
 
        // Locate the item 
        for ( i = 0; value == NULL && i < list->count; i ++ )
-               if ( !strcmp( list->name[ i ], name ) )
+               if ( name[ 0 ] == list->name[ i ][ 0 ] && !strcmp( list->name[ i ], name ) )
                        value = list->value[ i ];
 
        return value;
@@ -140,11 +179,12 @@ static mlt_property mlt_properties_find( mlt_properties this, char *name )
 static mlt_property mlt_properties_add( mlt_properties this, char *name )
 {
        property_list *list = this->private;
+       int key = generate_hash( name );
 
        // Check that we have space and resize if necessary
        if ( list->count == list->size )
        {
-               list->size += 10;
+               list->size += 50;
                list->name = realloc( list->name, list->size * sizeof( char * ) );
                list->value = realloc( list->value, list->size * sizeof( mlt_property ) );
        }
@@ -153,6 +193,9 @@ static mlt_property mlt_properties_add( mlt_properties this, char *name )
        list->name[ list->count ] = strdup( name );
        list->value[ list->count ] = mlt_property_init( );
 
+       // Assign to hash table
+       list->hash[ key ] = list->count;
+
        // Return and increment count accordingly
        return list->value[ list->count ++ ];
 }
@@ -224,6 +267,17 @@ char *mlt_properties_get_value( mlt_properties this, int index )
        return NULL;
 }
 
+/** Get a data value by index.
+*/
+
+void *mlt_properties_get_data_at( mlt_properties this, int index, int *size )
+{
+       property_list *list = this->private;
+       if ( index >= 0 && index < list->count )
+               return mlt_property_get_data( list->value[ index ], size );
+       return NULL;
+}
+
 /** Return the number of items in the list.
 */