aspect fixes for rescale=none

[melted] / src / modules / ffmpeg / producer_ffmpeg.c

diff --git a/src/modules/ffmpeg/producer_ffmpeg.c b/src/modules/ffmpeg/producer_ffmpeg.c
index 662b1e4..cc76130 100644 (file)
--- a/src/modules/ffmpeg/producer_ffmpeg.c
+++ b/src/modules/ffmpeg/producer_ffmpeg.c
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 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;
@@ -451,7 +465,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
        if ( video != NULL && read_ffmpeg_header( this, &width, &height ) == 2 )
        {
                // Allocate an image
-               uint8_t *image = malloc( width * height * 2 );
+               uint8_t *image = mlt_pool_alloc( width * ( height + 1 ) * 2 );
                
                // Read it
                while( skip -- )
@@ -468,14 +482,13 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
                mlt_convert_yuv420p_to_yuv422( this->buffer, width, height, width, image );
 
                // Pass the data on the frame properties
-               mlt_properties_set_data( properties, "image", image, width * height * 2, free, NULL );
+               mlt_properties_set_data( properties, "image", image, width * ( height + 1 ) * 2, ( mlt_destructor )mlt_pool_release, NULL );
                mlt_properties_set_int( properties, "width", width );
                mlt_properties_set_int( properties, "height", height );
                mlt_properties_set_int( properties, "has_image", 1 );
 
                // Push the image callback
                mlt_frame_push_get_image( *frame, producer_get_image );
-
        }
        else
        {
@@ -491,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" );
+       double speed = mlt_producer_get_speed( producer );
 
        // 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 );
-
+       mlt_properties_set_double( properties, "_speed", speed );
 
        // 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 );