]> git.sesse.net Git - mlt/blobdiff - src/modules/vorbis/producer_vorbis.c
Add a frei0r param name mapping system.
[mlt] / src / modules / vorbis / producer_vorbis.c
index b5a12c4e365a85e685122397c61911c3038821b7..920108627f500d495535dadf00d1080b17e61a0e 100644 (file)
@@ -152,8 +152,14 @@ static int producer_open( mlt_producer this, mlt_profile profile, char *file )
                        char **ptr = ov_comment(ov, -1)->user_comments;
                        while(*ptr) {
                                metadata = vorbis_metadata_from_str (*ptr);
-                               if (metadata != NULL)
+                               if (metadata != NULL) {
                                        mlt_properties_set(properties, metadata->name, metadata->content);
+                                       if (metadata->name)
+                                               free(metadata->name);
+                                       if (metadata->content)
+                                               free(metadata->content);
+                                       free(metadata);
+                               }
                                ++ptr;
                        }
 
@@ -171,8 +177,8 @@ static int producer_open( mlt_producer this, mlt_profile profile, char *file )
 
                                // Get the vorbis info
                                vorbis_info *vi = ov_info( ov, -1 );
-                               mlt_properties_set_int( properties, "frequency", (int) vi->rate );
-                               mlt_properties_set_int( properties, "channels", vi->channels );
+                               mlt_properties_set_int( properties, "audio_frequency", (int) vi->rate );
+                               mlt_properties_set_int( properties, "audio_channels", vi->channels );
 
                                // Set some media metadata
                                mlt_properties_set_int( properties, "meta.media.nb_streams", 1 );
@@ -208,11 +214,8 @@ static double producer_time_of_frame( mlt_producer this, mlt_position position )
 
 static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format *format, int *frequency, int *channels, int *samples )
 {
-       // Get the properties from the frame
-       mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
-
        // Obtain the frame number of this frame
-       mlt_position position = mlt_properties_get_position( frame_properties, "vorbis_position" );
+       mlt_position position = mlt_frame_original_position( frame );
 
        // Get the producer 
        mlt_producer this = mlt_frame_pop_audio( frame );
@@ -220,6 +223,8 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
        // Get the producer properties
        mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
 
+       mlt_service_lock( MLT_PRODUCER_SERVICE( this ) );
+
        // Get the ogg vorbis file
        OggVorbis_File *ov = mlt_properties_get_data( properties, "ogg_vorbis_file", NULL );
 
@@ -342,6 +347,8 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
        // Regardless of speed, we expect to get the next frame (cos we ain't too bright)
        mlt_properties_set_position( properties, "audio_expected", position + 1 );
 
+       mlt_service_unlock( MLT_PRODUCER_SERVICE( this ) );
+
        return 0;
 }
 
@@ -356,16 +363,12 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
        // Update timecode on the frame we're creating
        mlt_frame_set_position( *frame, mlt_producer_position( this ) );
 
-       // Set the position of this producer
-       mlt_properties frame_properties = MLT_FRAME_PROPERTIES( *frame );
-       mlt_properties_set_position( frame_properties, "vorbis_position", mlt_producer_frame( this ) );
-
        // Set up the audio
        mlt_frame_push_audio( *frame, this );
        mlt_frame_push_audio( *frame, producer_get_audio );
 
        // Pass audio properties to the frame
-       mlt_properties_pass_list( frame_properties, MLT_PRODUCER_PROPERTIES( this ), "frequency, channels" );
+       mlt_properties_pass_list( MLT_FRAME_PROPERTIES(*frame), MLT_PRODUCER_PROPERTIES( this ), "frequency, channels" );
 
        // Calculate the next timecode
        mlt_producer_prepare_next( this );