X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2Fsrc%2Fmodules%2Fffmpeg%2Fproducer_ffmpeg.c;h=15b1c89ec5c0698f67e2304e507f8c6d75c30a69;hb=6336039a203c6496691784682f9ad56eb13abcc3;hp=2af9de37aa6ef844daf065bd5a56a26adec184f6;hpb=9390e8b584f3f717f0a326893c0e37cf187a0a51;p=melted diff --git a/mlt/src/modules/ffmpeg/producer_ffmpeg.c b/mlt/src/modules/ffmpeg/producer_ffmpeg.c index 2af9de3..15b1c89 100644 --- a/mlt/src/modules/ffmpeg/producer_ffmpeg.c +++ b/mlt/src/modules/ffmpeg/producer_ffmpeg.c @@ -30,6 +30,7 @@ #include #include #include +#include typedef struct producer_ffmpeg_s *producer_ffmpeg; @@ -160,6 +161,8 @@ mlt_producer producer_ffmpeg_init( char *file ) producer_ffmpeg this = calloc( sizeof( struct producer_ffmpeg_s ), 1 ); if ( file != NULL && this != NULL && mlt_producer_init( &this->parent, this ) == 0 ) { + int usable = 1; + // Get the producer mlt_producer producer = &this->parent; @@ -183,6 +186,9 @@ mlt_producer producer_ffmpeg_init( char *file ) } else { + struct stat buf; + if ( stat( file, &buf ) != 0 || !S_ISREG( buf.st_mode ) ) + usable = 0; mlt_properties_set( properties, "video_type", "file" ); mlt_properties_set( properties, "video_file", file ); mlt_properties_set( properties, "video_size", "" ); @@ -196,9 +202,17 @@ mlt_producer producer_ffmpeg_init( char *file ) mlt_properties_set( properties, "log_id", file ); mlt_properties_set( properties, "resource", file ); + mlt_properties_set_position( properties, "length", 36000 ); + mlt_properties_set_position( properties, "out", 36000 ); this->buffer = malloc( 1024 * 1024 * 2 ); + if ( !usable ) + { + mlt_producer_close( &this->parent ); + producer = NULL; + } + return producer; } free( this ); @@ -228,7 +242,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, mlt_timecode position ) +FILE *producer_ffmpeg_run_video( producer_ffmpeg this, mlt_position position ) { if ( this->video == NULL ) { @@ -265,7 +279,7 @@ FILE *producer_ffmpeg_run_video( producer_ffmpeg this, mlt_timecode position ) return this->video; } -FILE *producer_ffmpeg_run_audio( producer_ffmpeg this, mlt_timecode position ) +FILE *producer_ffmpeg_run_audio( producer_ffmpeg this, mlt_position position ) { // Get the producer mlt_producer producer = &this->parent; @@ -343,52 +357,6 @@ static void producer_ffmpeg_position( producer_ffmpeg this, uint64_t requested, this->open = 1; } -static int sample_calculator( float fps, int frequency, int64_t position ) -{ - int samples = 0; - - if ( fps > 29 && fps <= 30 ) - { - 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 @@ -415,7 +383,7 @@ 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 ) { rwpipe_close( producer->audio_pipe ); @@ -427,7 +395,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 ); } @@ -521,7 +489,6 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i // Push the image callback mlt_frame_push_get_image( *frame, producer_get_image ); - } else { @@ -537,39 +504,35 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i } // Push the image callback - mlt_frame_push_get_image( *frame, producer_get_image ); + if ( !this->end_of_video ) + mlt_frame_push_get_image( *frame, producer_get_image ); } // Set the audio pipe mlt_properties_set_data( properties, "producer_ffmpeg", this, 0, NULL, NULL ); // Hmm - register audio callback - ( *frame )->get_audio = producer_get_audio; + if ( !this->end_of_audio ) + ( *frame )->get_audio = producer_get_audio; // 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_properties_set_int( properties, "end_of_clip", 1 ); - mlt_properties_set_timecode( producer_properties, "length", mlt_producer_position( &this->parent ) ); + mlt_properties_set_position( 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 ) ); + mlt_frame_set_position( *frame, mlt_producer_position( producer ) ); // Calculate the next timecode mlt_producer_prepare_next( producer );