typedef struct
{
+ int hash[ 199 ];
char **name;
mlt_property *value;
int count;
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.
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;
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 ) );
}
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 ++ ];
}