fix aspect handling when rescale != none

[melted] / src / modules / dv / consumer_libdv.c

diff --git a/src/modules/dv/consumer_libdv.c b/src/modules/dv/consumer_libdv.c
index af25795..da86a03 100644 (file)
--- a/src/modules/dv/consumer_libdv.c
+++ b/src/modules/dv/consumer_libdv.c
@@ -98,6 +98,7 @@ static int consumer_start( mlt_consumer this )
        {
                // Allocate a thread
                pthread_t *thread = calloc( 1, sizeof( pthread_t ) );
+               pthread_attr_t thread_attributes;
 
                // Assign the thread to properties
                mlt_properties_set_data( properties, "thread", thread, sizeof( pthread_t ), free, NULL );
@@ -105,8 +106,12 @@ static int consumer_start( mlt_consumer this )
                // Set the running state
                mlt_properties_set_int( properties, "running", 1 );
 
+               // Inherit the scheduling priority
+               pthread_attr_init( &thread_attributes );
+               pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED );
+               
                // Create the thread
-               pthread_create( thread, NULL, consumer_thread, this );
+               pthread_create( thread, &thread_attributes, consumer_thread, this );
        }
        return 0;
 }
@@ -270,7 +275,7 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
                // Default audio args
                mlt_audio_format fmt = mlt_audio_pcm;
                int channels = 2;
-               int frequency = 48000;
+               int frequency = mlt_properties_get_int( this_properties, "frequency" );
                int samples = mlt_sample_calculator( mlt_properties_get_double( this_properties, "fps" ), frequency, count );
                int16_t *pcm = NULL;
 
@@ -300,6 +305,11 @@ static void consumer_encode_audio( mlt_consumer this, uint8_t *dv_frame, mlt_fra
                                for ( j = 0; j < channels; j++ )
                                        audio_buffers[ j ][ i ] = *pcm ++;
                }
+               else
+               {
+                       for ( j = 0; j < channels; j++ )
+                               memset( audio_buffers[ j ], 0, 2 * DV_AUDIO_MAX_SAMPLES );
+               }
 
                // Encode audio on frame
                dv_encode_full_audio( encoder, audio_buffers, channels, frequency, dv_frame );
@@ -425,4 +435,3 @@ static void consumer_close( mlt_consumer this )
        // Free the memory
        free( this );
 }
-