X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fffmpeg%2Fproducer_ffmpeg.c;h=662b1e46671b970f7680a63405956b917162e6fc;hb=8bf137cd71aafb9c8f6a42c78ddb6bd0a8fe99db;hp=95763dfff4790267ce75e8d0474bb65e458c6a2f;hpb=0cf7dff156fe3c541eb5d668e317cc73b008c7b0;p=melted diff --git a/src/modules/ffmpeg/producer_ffmpeg.c b/src/modules/ffmpeg/producer_ffmpeg.c index 95763df..662b1e4 100644 --- a/src/modules/ffmpeg/producer_ffmpeg.c +++ b/src/modules/ffmpeg/producer_ffmpeg.c @@ -26,12 +26,118 @@ #include #include #include +#include +#include +#include +#include typedef struct producer_ffmpeg_s *producer_ffmpeg; +/** Bi-directional pipe structure. +*/ + +typedef struct rwpipe +{ + int pid; + FILE *reader; + FILE *writer; +} +rwpipe; + +/** Create a bidirectional pipe for the given command. +*/ + +rwpipe *rwpipe_open( char *command ) +{ + rwpipe *this = malloc( sizeof( rwpipe ) ); + + if ( this != NULL ) + { + int input[ 2 ]; + int output[ 2 ]; + + pipe( input ); + pipe( output ); + + this->pid = fork(); + + if ( this->pid == 0 ) + { + signal( SIGPIPE, SIG_DFL ); + signal( SIGHUP, SIG_DFL ); + signal( SIGINT, SIG_DFL ); + signal( SIGTERM, SIG_DFL ); + signal( SIGSTOP, SIG_DFL ); + signal( SIGCHLD, SIG_DFL ); + + dup2( output[ 0 ], STDIN_FILENO ); + dup2( input[ 1 ], STDOUT_FILENO ); + + close( input[ 0 ] ); + close( input[ 1 ] ); + close( output[ 0 ] ); + close( output[ 1 ] ); + + execl( "/bin/sh", "sh", "-c", command, NULL ); + exit( 255 ); + } + else + { + setpgid( this->pid, this->pid ); + + close( input[ 1 ] ); + close( output[ 0 ] ); + + this->reader = fdopen( input[ 0 ], "r" ); + this->writer = fdopen( output[ 1 ], "w" ); + } + } + + return this; +} + +/** Read data from the pipe. +*/ + +FILE *rwpipe_reader( rwpipe *this ) +{ + if ( this != NULL ) + return this->reader; + else + return NULL; +} + +/** Write data to the pipe. +*/ + +FILE *rwpipe_writer( rwpipe *this ) +{ + if ( this != NULL ) + return this->writer; + else + return NULL; +} + +/** Close the pipe and process. +*/ + +void rwpipe_close( rwpipe *this ) +{ + if ( this != NULL ) + { + fclose( this->reader ); + fclose( this->writer ); + kill( - this->pid, SIGKILL ); + waitpid( - this->pid, NULL, 0 ); + free( this ); + } +} + struct producer_ffmpeg_s { struct mlt_producer_s parent; + rwpipe *video_pipe; + rwpipe *audio_pipe; FILE *video; FILE *audio; uint64_t expected; @@ -52,7 +158,7 @@ static void producer_close( mlt_producer parent ); mlt_producer producer_ffmpeg_init( char *file ) { producer_ffmpeg this = calloc( sizeof( struct producer_ffmpeg_s ), 1 ); - if ( this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) + if ( file != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) { // Get the producer mlt_producer producer = &this->parent; @@ -67,7 +173,7 @@ mlt_producer producer_ffmpeg_init( char *file ) // Set the properties mlt_properties_set( properties, "mlt_type", "producer_ffmpeg" ); - if ( file != NULL && !strcmp( file, "v4l" ) ) + if ( !strcmp( file, "v4l" ) ) { mlt_properties_set( properties, "video_type", "v4l" ); mlt_properties_set( properties, "video_file", "/dev/video0" ); @@ -88,6 +194,9 @@ mlt_producer producer_ffmpeg_init( char *file ) mlt_properties_set_int( properties, "audio_channels", 2 ); mlt_properties_set_int( properties, "audio_track", 0 ); + mlt_properties_set( properties, "log_id", file ); + mlt_properties_set( properties, "resource", file ); + this->buffer = malloc( 1024 * 1024 * 2 ); return producer; @@ -119,7 +228,7 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma return 0; } -FILE *producer_ffmpeg_run_video( producer_ffmpeg this ) +FILE *producer_ffmpeg_run_video( producer_ffmpeg this, mlt_timecode position ) { if ( this->video == NULL ) { @@ -140,9 +249,6 @@ FILE *producer_ffmpeg_run_video( producer_ffmpeg this ) float video_rate = mlt_properties_get_double( properties, "fps" ); char *video_size = mlt_properties_get( properties, "video_size" ); char command[ 1024 ] = ""; - float position = mlt_producer_position( &this->parent ); - - if ( video_loop ) position = 0; sprintf( command, "%s/ffmpeg/video.sh \"%s\" \"%s\" \"%s\" %f %f 2>/dev/null", mlt_prefix, @@ -150,15 +256,16 @@ FILE *producer_ffmpeg_run_video( producer_ffmpeg this ) video_file, video_size, video_rate, - position ); + ( float )position ); - this->video = popen( command, "r" ); + this->video_pipe = rwpipe_open( command ); + this->video = rwpipe_reader( this->video_pipe ); } } return this->video; } -FILE *producer_ffmpeg_run_audio( producer_ffmpeg this ) +FILE *producer_ffmpeg_run_audio( producer_ffmpeg this, mlt_timecode position ) { // Get the producer mlt_producer producer = &this->parent; @@ -179,20 +286,18 @@ FILE *producer_ffmpeg_run_audio( producer_ffmpeg this ) int channels = mlt_properties_get_int( properties, "audio_channels" ); int track = mlt_properties_get_int( properties, "audio_track" ); char command[ 1024 ] = ""; - float position = mlt_producer_position( &this->parent ); - - if ( audio_loop ) position = 0; sprintf( command, "%s/ffmpeg/audio.sh \"%s\" \"%s\" %f %d %d %d 2>/dev/null", mlt_prefix, audio_type, audio_file, - position, + ( float )position, frequency, channels, track ); - this->audio = popen( command, "r" ); + this->audio_pipe = rwpipe_open( command ); + this->audio = rwpipe_reader( this->audio_pipe ); } } return this->audio; @@ -211,12 +316,12 @@ static void producer_ffmpeg_position( producer_ffmpeg this, uint64_t requested, { // Close the video pipe if ( this->video != NULL ) - pclose( this->video ); + rwpipe_close( this->video_pipe ); this->video = NULL; // Close the audio pipe if ( this->audio != NULL ) - pclose( this->audio ); + rwpipe_close( this->audio_pipe ); this->audio = NULL; // We should not be open now @@ -226,69 +331,18 @@ static void producer_ffmpeg_position( producer_ffmpeg this, uint64_t requested, } // This is the next frame we expect - this->expected = mlt_producer_frame( &this->parent ) + 1; + this->expected = requested + 1; // Open the pipe - this->video = producer_ffmpeg_run_video( this ); + this->video = producer_ffmpeg_run_video( this, 0 ); // Open the audio pipe - this->audio = producer_ffmpeg_run_audio( this ); + this->audio = producer_ffmpeg_run_audio( this, 0 ); // We should be open now this->open = 1; } -static int sample_calculator( float fps, int frequency, int64_t position ) -{ - int samples = 0; - - if ( fps == 25 ) - { - samples = frequency / 25; - } - else if ( fps >= 29.97 && fps < 29.98 ) - { - samples = frequency / 30; - - switch ( frequency ) - { - case 48000: - if ( position % 5 != 0 ) - samples += 2; - break; - case 44100: - if ( position % 300 == 0 ) - samples = 1471; - else if ( position % 30 == 0 ) - samples = 1470; - else if ( position % 2 == 0 ) - samples = 1472; - else - samples = 1471; - break; - case 32000: - if ( position % 30 == 0 ) - samples = 1068; - else if ( position % 29 == 0 ) - samples = 1067; - else if ( position % 4 == 2 ) - samples = 1067; - else - samples = 1068; - break; - default: - samples = 0; - } - } - else - { - if ( fps != 0 ) - samples = frequency / fps; - } - - return samples; -} - static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples ) { // Get the frames properties @@ -315,10 +369,10 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma { do { - *samples = sample_calculator( fps, *frequency, target - skip ); + *samples = mlt_sample_calculator( fps, *frequency, target - skip ); if ( fread( *buffer, *samples * *channels * 2, 1, producer->audio ) != 1 ) { - pclose( producer->audio ); + rwpipe_close( producer->audio_pipe ); producer->audio = NULL; producer->end_of_audio = 1; } @@ -327,7 +381,7 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma } else { - *samples = sample_calculator( fps, *frequency, target ); + *samples = mlt_sample_calculator( fps, *frequency, target ); memset( *buffer, 0, size ); } @@ -432,7 +486,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Inform caller that end of clip is reached this->end_of_video = !video_loop; - pclose( this->video ); + rwpipe_close( this->video_pipe ); this->video = NULL; } @@ -442,7 +496,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Set the audio pipe mlt_properties_set_data( properties, "producer_ffmpeg", this, 0, NULL, NULL ); - mlt_properties_set_int( properties, "end_of_clip", this->end_of_video && this->end_of_audio ); // Hmm - register audio callback ( *frame )->get_audio = producer_get_audio; @@ -450,16 +503,24 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Get the additional properties double aspect_ratio = mlt_properties_get_double( producer_properties, "aspect_ratio" ); double speed = mlt_properties_get_double( producer_properties, "speed" ); + char *video_file = mlt_properties_get( producer_properties, "video_file" ); // Set them on the frame mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio ); mlt_properties_set_double( properties, "speed", speed ); + if ( strchr( video_file, '/' ) != NULL ) + mlt_properties_set( properties, "file", strrchr( video_file, '/' ) + 1 ); + else + mlt_properties_set( properties, "file", video_file ); + // Set the out point on the producer - if ( !this->end_of_video || !this->end_of_audio ) - mlt_producer_set_in_and_out( &this->parent, mlt_producer_get_in( &this->parent ), mlt_producer_position( &this->parent ) + 1 ); - else + if ( this->end_of_video && this->end_of_audio ) + { + mlt_properties_set_int( properties, "end_of_clip", 1 ); + mlt_properties_set_timecode( producer_properties, "length", mlt_producer_position( &this->parent ) ); mlt_producer_set_in_and_out( &this->parent, mlt_producer_get_in( &this->parent ), mlt_producer_position( &this->parent ) ); + } // Update timecode on the frame we're creating mlt_frame_set_timecode( *frame, mlt_producer_position( producer ) ); @@ -474,9 +535,9 @@ static void producer_close( mlt_producer parent ) { producer_ffmpeg this = parent->child; if ( this->video ) - pclose( this->video ); + rwpipe_close( this->video_pipe ); if ( this->audio ) - pclose( this->audio ); + rwpipe_close( this->audio_pipe ); parent->close = NULL; mlt_producer_close( parent ); free( this->buffer );