X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_data_show.c;h=d62bd58991013f2200c01ed8ba7f8d0ca792d396;hb=226015c39de42a4593b7d1f33d2aa65dd77aa1aa;hp=db2e6707be2c9dd2c822cf6b43c84af95fdf1176;hpb=f00476101550ec7d8e863f6516aa83bc1b524570;p=mlt diff --git a/src/modules/core/filter_data_show.c b/src/modules/core/filter_data_show.c index db2e6707..d62bd589 100644 --- a/src/modules/core/filter_data_show.c +++ b/src/modules/core/filter_data_show.c @@ -3,22 +3,21 @@ * Copyright (C) 2004-2005 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 "filter_data.h" #include #include #include @@ -44,27 +43,21 @@ static mlt_filter obtain_filter( mlt_filter filter, char *type ) // Obtain the profile_properties if we haven't already if ( profile_properties == NULL ) { + char temp[ 512 ]; + // Get the profile requested - char *profile = mlt_properties_get( filter_properties, "profile" ); + char *profile = mlt_properties_get( filter_properties, "resource" ); - // Load the specified profile or use the default - if ( profile != NULL ) - { - profile_properties = mlt_properties_load( profile ); - } + // If none is specified, pick up the default for this normalisation + if ( profile == NULL ) + sprintf( temp, "%s/feeds/%s/data_fx.properties", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ) ); + else if ( strchr( profile, '%' ) ) + sprintf( temp, "%s/feeds/%s/%s", mlt_environment( "MLT_DATA" ), mlt_environment( "MLT_NORMALISATION" ), strchr( profile, '%' ) + 1 ); else - { - // Sometimes C can be laborious.. - static char *default_file = "/data_fx.properties"; - char *temp = malloc( strlen( mlt_factory_prefix( ) ) + strlen( default_file ) + 1 ); - if ( temp != NULL ) - { - strcpy( temp, mlt_factory_prefix( ) ); - strcat( temp, default_file ); - profile_properties = mlt_properties_load( temp ); - free( temp ); - } - } + strcpy( temp, profile ); + + // Load the specified profile or use the default + profile_properties = mlt_properties_load( temp ); // Store for later retrieval mlt_properties_set_data( filter_properties, "profile_properties", profile_properties, 0, ( mlt_destructor )mlt_properties_close, NULL ); @@ -78,7 +71,7 @@ static mlt_filter obtain_filter( mlt_filter filter, char *type ) char *value = mlt_properties_get_value( profile_properties, i ); if ( result == NULL && !strcmp( name, type ) && result == NULL ) - result = mlt_factory_filter( value, NULL ); + result = mlt_factory_filter( mlt_service_profile( MLT_FILTER_SERVICE( filter ) ), value, NULL ); else if ( result != NULL && !strncmp( name, type, type_len ) && name[ type_len ] == '.' ) mlt_properties_set( MLT_FILTER_PROPERTIES( result ), name + type_len + 1, value ); else if ( result != NULL ) @@ -89,6 +82,36 @@ static mlt_filter obtain_filter( mlt_filter filter, char *type ) return result; } +/** Retrieve medatata value +*/ + +char* metadata_value(mlt_properties properties, char* name) +{ + if (name == NULL) return NULL; + char *meta = malloc( strlen(name) + 18 ); + sprintf( meta, "meta.attr.%s.markup", name); + char *result = mlt_properties_get( properties, meta); + free(meta); + return result; +} + +/** Convert frames to Timecode +*/ + +char* frame_to_timecode( int frames , int fps) +{ + if (fps == 0) return strdup("-"); + char *res = malloc(12); + int seconds = frames / (int) fps; + frames = frames % ((int) fps); + int minutes = seconds / 60; + seconds = seconds % 60; + int hours = minutes / 60; + minutes = minutes % 60; + sprintf(res, "%.2d:%.2d:%.2d:%.2d", hours, minutes, seconds, frames); + return res; +} + /** Process the frame for the requested type */ @@ -106,9 +129,6 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame // Fetch the filter associated to this type mlt_filter requested = mlt_properties_get_data( filter_properties, type, NULL ); - // Calculate the length of the feed - int length = mlt_properties_get_int( feed, "out" ) - mlt_properties_get_int( feed, "in" ) + 1; - // If it doesn't exist, then create it now if ( requested == NULL ) { @@ -124,9 +144,21 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame { int i = 0; mlt_properties properties = MLT_FILTER_PROPERTIES( requested ); - static char *prefix = "properties."; + static const char *prefix = "properties."; int len = strlen( prefix ); + // Determine if this is an absolute or relative feed + int absolute = mlt_properties_get_int( feed, "absolute" ); + + // Make do with what we have + int length = !absolute ? + mlt_properties_get_int( feed, "out" ) - mlt_properties_get_int( feed, "in" ) + 1 : + mlt_properties_get_int( feed, "out" ) + 1; + + // Repeat period + int period = mlt_properties_get_int( properties, "period" ); + period = period == 0 ? 1 : period; + // Pass properties from feed into requested for ( i = 0; i < mlt_properties_count( properties ); i ++ ) { @@ -136,21 +168,69 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame { if ( !strncmp( name + len, "length[", 7 ) ) { - int period = mlt_properties_get_int( properties, "period" ); - period = period == 0 ? 1 : period; - mlt_properties_set_position( properties, key, length / period ); + mlt_properties_set_position( properties, key, ( length - period ) / period ); } else { char *value = mlt_properties_get( feed, name + len ); if ( value != NULL ) - mlt_properties_set( properties, key, value ); + { + // check for metadata keywords in metadata markup if user requested so + if ( mlt_properties_get_int( filter_properties, "dynamic" ) == 1 && !strcmp( name + strlen( name ) - 6, "markup") ) + { + // Find keywords which should be surrounded by '#', like: #title# + char* keywords = strtok( value, "#" ); + char result[512] = ""; // XXX: how much is enough? + int ct = 0; + int fromStart = ( value[0] == '#' ) ? 1 : 0; + + while ( keywords != NULL ) + { + if ( ct % 2 == fromStart ) + { + // backslash in front of # suppresses substitution + if ( keywords[ strlen( keywords ) -1 ] == '\\' ) + { + // keep characters except backslash + strncat( result, keywords, strlen( keywords ) -1 ); + strcat( result, "#" ); + ct++; + } + else + { + strcat( result, keywords ); + } + } + else if ( !strcmp( keywords, "timecode" ) ) + { + // special case: replace #timecode# with current frame timecode + int pos = mlt_properties_get_int( feed, "position" ); + char *tc = frame_to_timecode( pos, mlt_profile_fps( mlt_service_profile( MLT_FILTER_SERVICE( filter ) ) ) ); + strcat( result, tc ); + free( tc ); + } + else + { + // replace keyword with metadata value + char *metavalue = metadata_value( MLT_FRAME_PROPERTIES( frame ), keywords ); + strcat( result, metavalue ? metavalue : "-" ); + } + keywords = strtok( NULL, "#" ); + ct++; + } + mlt_properties_set( properties, key, (char*) result ); + } + else mlt_properties_set( properties, key, value ); + } } } } // Set the original position on the frame - mlt_frame_set_position( frame, mlt_properties_get_int( feed, "position" ) - mlt_properties_get_int( feed, "in" ) ); + if ( absolute == 0 ) + mlt_frame_set_position( frame, mlt_properties_get_int( feed, "position" ) - mlt_properties_get_int( feed, "in" ) ); + else + mlt_frame_set_position( frame, mlt_properties_get_int( feed, "position" ) ); // Process the filter mlt_filter_process( requested, frame ); @@ -162,6 +242,44 @@ static int process_feed( mlt_properties feed, mlt_filter filter, mlt_frame frame return error; } +void process_queue( mlt_deque data_queue, mlt_frame frame, mlt_filter filter ) +{ + if ( data_queue != NULL ) + { + // Create a new queue for those that we can't handle + mlt_deque temp_queue = mlt_deque_init( ); + + // Iterate through each entry on the queue + while ( mlt_deque_peek_front( data_queue ) != NULL ) + { + // Get the data feed + mlt_properties feed = mlt_deque_pop_front( data_queue ); + + if ( mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "debug" ) != NULL ) + mlt_properties_debug( feed, mlt_properties_get( MLT_FILTER_PROPERTIES( filter ), "debug" ), stderr ); + + // Process the data feed... + if ( process_feed( feed, filter, frame ) == 0 ) + mlt_properties_close( feed ); + else + mlt_deque_push_back( temp_queue, feed ); + } + + // Now put the unprocessed feeds back on the stack + while ( mlt_deque_peek_front( temp_queue ) ) + { + // Get the data feed + mlt_properties feed = mlt_deque_pop_front( temp_queue ); + + // Put it back on the data queue + mlt_deque_push_back( data_queue, feed ); + } + + // Close the temporary queue + mlt_deque_close( temp_queue ); + } +} + /** Get the image. */ @@ -173,21 +291,11 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format // Get the frame properties mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame ); - // Fetch the data queue - mlt_deque data_queue = mlt_properties_get_data( frame_properties, "data_queue", NULL ); - - // Iterate through each entry on the queue - while ( data_queue != NULL && mlt_deque_peek_front( data_queue ) != NULL ) - { - // Get the data feed - mlt_properties feed = mlt_deque_pop_front( data_queue ); + // Track specific + process_queue( mlt_properties_get_data( frame_properties, "data_queue", NULL ), frame, filter ); - // Process the data feed... - process_feed( feed, filter, frame ); - - // Close the feed - mlt_properties_close( feed ); - } + // Global + process_queue( mlt_properties_get_data( frame_properties, "global_queue", NULL ), frame, filter ); // Need to get the image return mlt_frame_get_image( frame, image, format, width, height, 1 ); @@ -212,7 +320,7 @@ static mlt_frame filter_process( mlt_filter this, mlt_frame frame ) /** Constructor for the filter. */ -mlt_filter filter_data_show_init( char *arg ) +mlt_filter filter_data_show_init( mlt_profile profile, mlt_service_type type, const char *id, void *arg ) { // Create the filter mlt_filter this = mlt_filter_new( ); @@ -224,7 +332,7 @@ mlt_filter filter_data_show_init( char *arg ) mlt_properties properties = MLT_FILTER_PROPERTIES( this ); // Assign the argument (default to titles) - mlt_properties_set( properties, "profile", arg == NULL ? NULL : arg ); + mlt_properties_set( properties, "resource", arg == NULL ? NULL : arg ); // Specify the processing method this->process = filter_process;