correction on playlist ffmpeg sizing issue and additional sdl tweaks
[melted] / src / modules / ffmpeg / producer_ffmpeg.c
index 9e2eed0..4506ff8 100644 (file)
@@ -28,7 +28,6 @@ typedef struct producer_ffmpeg_s *producer_ffmpeg;
 struct producer_ffmpeg_s
 {
        struct mlt_producer_s parent;
-       char *command;
        FILE *video;
        FILE *audio;
        uint64_t expected;
@@ -36,25 +35,47 @@ struct producer_ffmpeg_s
        int open;
        int width;
        int height;
+       int end_of_video;
+       int end_of_audio;
 };
 
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
 static void producer_close( mlt_producer parent );
 
-mlt_producer producer_ffmpeg_init( char *command )
+/** Consutruct an ffmpeg producer.
+*/
+
+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 )
        {
+               // Get the producer
                mlt_producer producer = &this->parent;
 
+               // Get the properties of the producer
+               mlt_properties properties = mlt_producer_properties( producer );
+
+               // Override get_frame and close methods
                producer->get_frame = producer_get_frame;
                producer->close = producer_close;
 
-               if ( command != NULL )
-                       this->command = strdup( command );
+               // Set the properties
+               mlt_properties_set( properties, "mlt_type", "producer_ffmpeg" );
+               mlt_properties_set_int( properties, "known_length", 0 );
+               mlt_properties_set( properties, "video_type", file );
+               if ( file != NULL && !strcmp( file, "v4l" ) )
+               {
+                       mlt_properties_set( properties, "video_file", "/dev/video0" );
+                       mlt_properties_set( properties, "audio_file", "/dev/dsp" );
+               }
+               else
+               {
+                       mlt_properties_set( properties, "video_file", file );
+                       mlt_properties_set( properties, "audio_file", file );
+               }
 
-               this->buffer = malloc( 1024 * 1024 );
+               this->buffer = malloc( 1024 * 1024 * 2 );
 
                return producer;
        }
@@ -87,15 +108,33 @@ static int producer_get_image( mlt_frame this, uint8_t **buffer, mlt_image_forma
 
 FILE *producer_ffmpeg_run_video( producer_ffmpeg this )
 {
-       if ( this->video == NULL && !this->open )
+       // Get the producer
+       mlt_producer producer = &this->parent;
+
+       // Get the properties of the producer
+       mlt_properties properties = mlt_producer_properties( producer );
+
+       char *video_type = mlt_properties_get( properties, "video_type" );
+       char *video_file = mlt_properties_get( properties, "video_file" );
+       int video_loop = mlt_properties_get_int( properties, "video_loop" );
+
+       if ( this->video == NULL )
        {
-               if ( this->command != NULL )
+               if ( !this->open || video_loop )
                {
-                       char command[ 1024 ];
+                       char command[ 1024 ] = "";
                        float fps = mlt_producer_get_fps( &this->parent );
                        float position = mlt_producer_position( &this->parent );
-                       sprintf( command, "ffmpeg -i \"%s\" -ss %f -f imagepipe -r %f -f yuv4mpegpipe - 2>/dev/null", this->command, position, fps );
-                       this->video = popen( command, "r" );
+
+                       if ( video_loop ) position = 0;
+
+                       if ( video_type != NULL && !strcmp( video_type, "v4l" ) )
+                               sprintf( command, "ffmpeg -r %f -s 640x480 -vd \"%s\" -f imagepipe -f yuv4mpegpipe - 2>/dev/null", fps, video_file );
+                       else if ( video_file != NULL && strcmp( video_file, "" ) )
+                               sprintf( command, "ffmpeg -i \"%s\" -ss %f -f imagepipe -r %f -f yuv4mpegpipe - 2>/dev/null", video_file, position, fps );
+
+                       if ( strcmp( command, "" ) )
+                               this->video = popen( command, "r" );
                }
        }
        return this->video;
@@ -103,32 +142,62 @@ FILE *producer_ffmpeg_run_video( producer_ffmpeg this )
 
 FILE *producer_ffmpeg_run_audio( producer_ffmpeg this )
 {
-       if ( this->audio == NULL && !this->open )
+       // Get the producer
+       mlt_producer producer = &this->parent;
+
+       // Get the properties of the producer
+       mlt_properties properties = mlt_producer_properties( producer );
+
+       char *video_type = mlt_properties_get( properties, "video_type" );
+       char *audio_file = mlt_properties_get( properties, "audio_file" );
+       int audio_loop = mlt_properties_get_int( properties, "audio_loop" );
+
+       if ( this->audio == NULL )
        {
-               if ( this->command != NULL )
+               if ( !this->open || audio_loop )
                {
-                       char command[ 1024 ];
+                       char command[ 1024 ] = "";
                        float position = mlt_producer_position( &this->parent );
-                       sprintf( command, "ffmpeg -i \"%s\" -ss %f -f s16le -ar 48000 -ac 2 - 2>/dev/null", this->command, position );
-                       this->audio = popen( command, "r" );
+
+                       if ( audio_loop ) position = 0;
+
+                       if ( video_type != NULL && !strcmp( video_type, "v4l" ) )
+                               sprintf( command, "ffmpeg -ad \"%s\" -f s16le -ar 48000 -ac 2 - 2>/dev/null", audio_file );
+                       else if ( audio_file != NULL )
+                               sprintf( command, "ffmpeg -i \"%s\" -ss %f -f s16le -ar 48000 -ac 2 - 2>/dev/null", audio_file, position );
+
+                       if ( strcmp( command, "" ) )
+                               this->audio = popen( command, "r" );
                }
        }
        return this->audio;
 }
 
-static void producer_ffmpeg_position( producer_ffmpeg this, uint64_t requested )
+static void producer_ffmpeg_position( producer_ffmpeg this, uint64_t requested, int *skip )
 {
-       if ( requested != this->expected )
+       *skip = 0;
+
+       if ( this->open && requested > this->expected )
+       {
+               // Skip the following n frames
+               *skip = requested - this->expected;
+       }
+       else if ( requested != this->expected )
        {
+               // Close the video pipe
                if ( this->video != NULL )
                        pclose( this->video );
                this->video = NULL;
+
+               // Close the audio pipe
                if ( this->audio != NULL )
                        pclose( this->audio );
                this->audio = NULL;
        
                // We should not be open now
                this->open = 0;
+               this->end_of_video = 0;
+               this->end_of_audio = 0;
        }
 
        // This is the next frame we expect
@@ -151,6 +220,8 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
 
        producer_ffmpeg producer = mlt_properties_get_data( properties, "producer_ffmpeg", NULL );
 
+       int skip = mlt_properties_get_int( properties, "skip" );
+
        *frequency = 48000;
        *channels = 2;
        *samples = 1920;
@@ -164,11 +235,16 @@ static int producer_get_audio( mlt_frame this, int16_t **buffer, mlt_audio_forma
        // Read it
        if ( producer->audio != NULL )
        {
-               if ( fread( *buffer, size, 1, producer->audio ) != 1 )
+               do
                {
-                       pclose( producer->audio );
-                       producer->audio = NULL;
+                       if ( fread( *buffer, size, 1, producer->audio ) != 1 )
+                       {
+                               pclose( producer->audio );
+                               producer->audio = NULL;
+                               producer->end_of_audio = 1;
+                       }
                }
+               while( skip -- );
        }
        else
        {
@@ -215,18 +291,21 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        producer_ffmpeg this = producer->child;
        int width;
        int height;
+       int skip;
 
        // Construct a test frame
        *frame = mlt_frame_init( );
 
        // Are we at the position expected?
-       producer_ffmpeg_position( this, mlt_producer_frame( producer ) );
+       producer_ffmpeg_position( this, mlt_producer_frame( producer ), &skip );
 
        // Get the frames properties
        mlt_properties properties = mlt_frame_properties( *frame );
 
        FILE *video = this->video;
 
+       mlt_properties_set_int( properties, "skip", skip );
+
        // Read the video
        if ( video != NULL && read_ffmpeg_header( this, &width, &height ) == 2 )
        {
@@ -234,6 +313,14 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                uint8_t *image = malloc( width * height * 2 );
                
                // Read it
+               while( skip -- )
+               {
+                       if ( fread( this->buffer, width * height * 3 / 2, 1, video ) == 1 )
+                               read_ffmpeg_header( this, &width, &height );
+                       else
+                               skip = 0;
+               }
+
                fread( this->buffer, width * height * 3 / 2, 1, video );
 
                // Convert it
@@ -247,12 +334,15 @@ 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
        {
                // Clean up
                if ( this->video != NULL )
                {
+                       // Inform caller that end of clip is reached
+                       this->end_of_video = 1;
                        pclose( this->video );
                        this->video = NULL;
                }
@@ -263,10 +353,28 @@ 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;
 
+       // Get properties objects
+       mlt_properties producer_properties = mlt_producer_properties( &this->parent );
+
+       // Get the additional properties
+       double aspect_ratio = mlt_properties_get_double( producer_properties, "aspect_ratio" );
+       double speed = mlt_properties_get_double( producer_properties, "speed" );
+
+       // Set them on the frame
+       mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
+       mlt_properties_set_double( properties, "speed", speed );
+
+       // 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
+               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 ) );
 
@@ -283,9 +391,9 @@ static void producer_close( mlt_producer parent )
                pclose( this->video );
        if ( this->audio )
                pclose( this->audio );
-       free( this->command );
        parent->close = NULL;
        mlt_producer_close( parent );
+       free( this->buffer );
        free( this );
 }