#include <string.h>
#include <errno.h>
#include <signal.h>
+#include <limits.h>
#include <sys/mman.h>
miracle_unit_status_communicate( this );
}
+static mlt_producer create_producer( char *file )
+{
+ return mlt_factory_producer( "fezzik", file );
+}
+
/** Create or locate a producer for the file specified.
*/
-static mlt_producer create_producer( miracle_unit unit, char *file )
+static mlt_producer locate_producer( miracle_unit unit, char *file )
{
// Get the unit properties
mlt_properties properties = unit->producers;
if ( result == NULL )
{
- // 1st Line preferences
- if ( strstr( file, ".inigo" ) )
- {
- char *args[ 2 ] = { file, NULL };
- result = mlt_factory_producer( "inigo", args );
- }
- else if ( strstr( file, ".mpg" ) )
- result = mlt_factory_producer( "mcmpeg", file );
- else if ( strstr( file, ".mpeg" ) )
- result = mlt_factory_producer( "mcmpeg", file );
- else if ( strstr( file, ".dv" ) )
- result = mlt_factory_producer( "mcdv", file );
- else if ( strstr( file, ".dif" ) )
- result = mlt_factory_producer( "mcdv", file );
- else if ( strstr( file, ".jpg" ) )
- result = mlt_factory_producer( "pixbuf", file );
- else if ( strstr( file, ".JPG" ) )
- result = mlt_factory_producer( "pixbuf", file );
- else if ( strstr( file, ".jpeg" ) )
- result = mlt_factory_producer( "pixbuf", file );
- else if ( strstr( file, ".png" ) )
- result = mlt_factory_producer( "pixbuf", file );
-
- // 2nd Line fallbacks
- if ( result == NULL && strstr( file, ".dv" ) )
- result = mlt_factory_producer( "libdv", file );
- else if ( result == NULL && strstr( file, ".dif" ) )
- result = mlt_factory_producer( "libdv", file );
-
- // 3rd line fallbacks
- if ( result == NULL )
- result = mlt_factory_producer( "ffmpeg", file );
+ // Create the producer
+ result = create_producer( file );
// Now store the result
- mlt_properties_set_data( properties, file, result, 0, ( mlt_destructor )mlt_producer_close, NULL );
+ if ( result != NULL )
+ mlt_properties_set_data( properties, file, result, 0, ( mlt_destructor )mlt_producer_close, NULL );
}
return result;
mlt_properties properties = unit->properties;
int generation = mlt_properties_get_int( properties, "generation" );
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
- mlt_producer producer = mlt_playlist_producer( playlist );
valerie_response_printf( response, 1024, "%d\n", generation );
i, info.resource,
info.frame_in,
info.frame_out,
- mlt_producer_frame_position( producer, info.playtime ),
- mlt_producer_frame_position( producer, info.length ),
+ info.frame_count,
+ info.length,
info.fps );
}
}
valerie_error_code miracle_unit_load( miracle_unit unit, char *clip, int64_t in, int64_t out, int flush )
{
- // Have to clear the unit first
- clear_unit( unit );
-
// Now try to create an producer
- mlt_producer instance = create_producer( unit, clip );
+ mlt_producer instance = create_producer( clip );
if ( instance != NULL )
{
+ clear_unit( unit );
mlt_properties properties = unit->properties;
+ mlt_properties_set_data( unit->producers, clip, instance, 0, ( mlt_destructor )mlt_producer_close, NULL );
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
- mlt_playlist_append_io( playlist, instance, mlt_producer_time( instance, in ), mlt_producer_time( instance, out ) );
+ mlt_playlist_append_io( playlist, instance, in, out );
miracle_log( LOG_DEBUG, "loaded clip %s", clip );
miracle_unit_status_communicate( unit );
return valerie_ok;
valerie_error_code miracle_unit_insert( miracle_unit unit, char *clip, int index, int64_t in, int64_t out )
{
- mlt_producer instance = create_producer( unit, clip );
+ mlt_producer instance = locate_producer( unit, clip );
if ( instance != NULL )
{
mlt_properties properties = unit->properties;
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
- mlt_playlist_insert( playlist, instance, index, mlt_producer_time( instance, in ), mlt_producer_time( instance, out ) );
+ mlt_playlist_insert( playlist, instance, index, in, out );
miracle_log( LOG_DEBUG, "inserted clip %s at %d", clip, index );
update_generation( unit );
miracle_unit_status_communicate( unit );
{
clear_unit( unit );
miracle_log( LOG_DEBUG, "Cleaned playlist" );
+ miracle_unit_status_communicate( unit );
return valerie_ok;
}
valerie_error_code miracle_unit_append( miracle_unit unit, char *clip, int64_t in, int64_t out )
{
- mlt_producer instance = create_producer( unit, clip );
+ mlt_producer instance = locate_producer( unit, clip );
if ( instance != NULL )
{
mlt_properties properties = unit->properties;
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
- mlt_playlist_append_io( playlist, instance, mlt_producer_time( instance, in ), mlt_producer_time( instance, out ) );
+ mlt_playlist_append_io( playlist, instance, in, out );
miracle_log( LOG_DEBUG, "appended clip %s", clip );
update_generation( unit );
miracle_unit_status_communicate( unit );
return valerie_invalid_file;
}
-/** Start playing the clip.
-
- Start a dv-pump and commence dv1394 transmission.
+/** Start playing the unit.
\todo error handling
\param unit A miracle_unit handle.
mlt_properties properties = unit->properties;
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
mlt_producer producer = mlt_playlist_producer( playlist );
+ mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
mlt_producer_set_speed( producer, ( double )speed / 1000 );
+ mlt_consumer_start( consumer );
miracle_unit_status_communicate( unit );
}
void miracle_unit_terminate( miracle_unit unit )
{
+ mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
+ mlt_consumer_stop( consumer );
+ miracle_unit_status_communicate( unit );
}
/** Query the status of unit playback.
int miracle_unit_has_terminated( miracle_unit unit )
{
- return 0;
+ mlt_consumer consumer = mlt_properties_get_data( unit->properties, "consumer", NULL );
+ return mlt_consumer_is_stopped( consumer );
}
/** Transfer the currently loaded clip to another unit
status->fps = mlt_producer_get_fps( producer );
status->in = info.frame_in;
status->out = info.frame_out;
- status->position = mlt_producer_frame_position( producer, mlt_producer_position( clip ) );
- status->length = mlt_producer_frame_position( producer, mlt_producer_get_length( clip ) );
+ status->position = mlt_producer_position( clip );
+ status->length = mlt_producer_get_length( clip );
strncpy( status->tail_clip, info.resource, sizeof( status->tail_clip ) );
status->tail_in = info.frame_in;
status->tail_out = info.frame_out;
- status->tail_position = mlt_producer_frame_position( producer, mlt_producer_position( clip ) );
- status->tail_length = mlt_producer_frame_position( producer, mlt_producer_get_length( clip ) );
+ status->tail_position = mlt_producer_position( clip );
+ status->tail_length = mlt_producer_get_length( clip );
status->clip_index = mlt_playlist_current_clip( playlist );
status->seek_flag = 1;
}
status->generation = mlt_properties_get_int( properties, "generation" );
- if ( !strcmp( status->clip, "" ) )
+ if ( miracle_unit_has_terminated( unit ) )
+ status->status = unit_stopped;
+ else if ( !strcmp( status->clip, "" ) )
status->status = unit_not_loaded;
else if ( status->speed == 0 )
status->status = unit_paused;
else if ( clip >= mlt_playlist_count( playlist ) )
{
clip = mlt_playlist_count( playlist ) - 1;
- position = 999999999999;
+ position = LONG_MAX;
}
if ( mlt_playlist_get_clip_info( playlist, &info, clip ) == 0 )
{
- int64_t frame_start = mlt_producer_frame_position( info.producer, info.start );
+ int64_t frame_start = info.start;
int64_t frame_offset = position;
if ( frame_offset < 0 )
if ( frame_offset >= info.frame_out )
frame_offset = info.frame_out;
- mlt_producer_seek_frame( producer, frame_start + frame_offset - info.frame_in );
+ mlt_producer_seek( producer, frame_start + frame_offset - info.frame_in );
}
miracle_unit_status_communicate( unit );
if ( error == 0 )
{
- mlt_timecode in = mlt_producer_time( info.producer, position );
- error = mlt_playlist_resize_clip( playlist, index, in, info.out );
+ miracle_unit_play( unit, 0 );
+ error = mlt_playlist_resize_clip( playlist, index, position, info.frame_out );
update_generation( unit );
miracle_unit_change_position( unit, index, 0 );
}
if ( error == 0 )
{
- mlt_timecode out = mlt_producer_time( info.producer, position );
- error = mlt_playlist_resize_clip( playlist, index, info.in, out );
+ miracle_unit_play( unit, 0 );
+ error = mlt_playlist_resize_clip( playlist, index, info.frame_in, position );
update_generation( unit );
miracle_unit_status_communicate( unit );
miracle_unit_change_position( unit, index, -1 );
mlt_properties properties = unit->properties;
mlt_playlist playlist = mlt_properties_get_data( properties, "playlist", NULL );
mlt_producer producer = mlt_playlist_producer( playlist );
- mlt_timecode position = mlt_producer_position( producer );
- mlt_producer_seek_frame( producer, mlt_producer_frame_position( producer, position ) + offset );
+ mlt_position position = mlt_producer_frame( producer );
+ mlt_producer_seek( producer, position + offset );
}
/** Set the unit's clip mode regarding in and out points.
projects / melted / blobdiff