* Copyright (C) 2003-2004 Ushodaya Enterprises Limited
* Author: Charles Yates <charles.yates@pandora.be>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// Local header files
-#include "producer_vorbis.h"
-
// MLT Header files
+#include <framework/mlt_producer.h>
#include <framework/mlt_frame.h>
// vorbis Header files
// System header files
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
// Forward references.
static int producer_open( mlt_producer this, char *file );
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
+/** Structure for metadata reading
+*/
+
+typedef struct _sw_metadata sw_metadata;
+
+struct _sw_metadata {
+ char * name;
+ char * content;
+};
+
+static sw_metadata *vorbis_metadata_from_str (char * str)
+{
+ sw_metadata * meta = NULL;
+ int i;
+
+ for (i = 0; str[i]; i++) {
+ str[i] = tolower(str[i]);
+ if (str[i] == '=') {
+ str[i] = '\0';
+ meta = malloc (sizeof (sw_metadata));
+ meta->name = malloc( strlen(str) + 18 );
+ sprintf(meta->name, "meta.attr.%s.markup", str);
+ meta->content = strdup (&str[i+1]);
+ break;
+ }
+ }
+ return meta;
+}
+
/** Constructor for libvorbis.
*/
-mlt_producer producer_vorbis_init( char *file )
+mlt_producer producer_vorbis_init( mlt_profile profile, mlt_service_type type, const char *id, char *file )
{
mlt_producer this = NULL;
if ( mlt_producer_init( this, NULL ) == 0 )
{
// Get the properties
- mlt_properties properties = mlt_producer_properties( this );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
// Set the resource property (required for all producers)
mlt_properties_set( properties, "resource", file );
if ( error == 0 )
{
// Get the properties
- mlt_properties properties = mlt_producer_properties( this );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
// Assign the ov structure
mlt_properties_set_data( properties, "ogg_vorbis_file", ov, 0, producer_file_close, NULL );
+ // Read metadata
+ sw_metadata * metadata = NULL;
+ char **ptr = ov_comment(ov, -1)->user_comments;
+ while(*ptr) {
+ metadata = vorbis_metadata_from_str (*ptr);
+ if (metadata != NULL)
+ mlt_properties_set(properties, metadata->name, metadata->content);
+ ++ptr;
+ }
+
if ( ov_seekable( ov ) )
{
// Get the length of the file
double length = ov_time_total( ov, -1 );
// We will treat everything with the producer fps
- double fps = mlt_properties_get_double( properties, "fps" );
+ double fps = mlt_producer_get_fps( this );
// Set out and length of file
mlt_properties_set_position( properties, "out", ( length * fps ) - 1 );
mlt_properties_set_position( properties, "length", ( length * fps ) );
+
+ // 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 );
}
}
else
static double producer_time_of_frame( mlt_producer this, mlt_position position )
{
- // Get the properties
- mlt_properties properties = mlt_producer_properties( this );
-
- // Obtain the fps
- double fps = mlt_properties_get_double( properties, "fps" );
-
- // Do the calc
- return ( double )position / fps;
+ return ( double )position / mlt_producer_get_fps( this );
}
/** Get the audio from a frame.
static int producer_get_audio( mlt_frame frame, int16_t **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 );
+ 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" );
// Get the producer
- mlt_producer this = mlt_properties_get_data( frame_properties, "vorbis_producer", NULL );
+ mlt_producer this = mlt_frame_pop_audio( frame );
// Get the producer properties
- mlt_properties properties = mlt_producer_properties( this );
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
// Get the ogg vorbis file
OggVorbis_File *ov = mlt_properties_get_data( properties, "ogg_vorbis_file", NULL );
mlt_position expected = mlt_properties_get_position( properties, "audio_expected" );
// Get the fps for this producer
- double fps = mlt_properties_get_double( properties, "fps" );
+ double fps = mlt_producer_get_fps( this );
// Get the vorbis info
vorbis_info *vi = ov_info( ov, -1 );
// Check for audio buffer and create if necessary
if ( audio_buffer == NULL )
{
- // Release pointer
- void *release = NULL;
-
// Allocate the audio buffer
- audio_buffer = mlt_pool_allocate( 131072 * sizeof( int16_t ), &release );
+ audio_buffer = mlt_pool_alloc( 131072 * sizeof( int16_t ) );
// And store it on properties for reuse
- mlt_properties_set_data( properties, "audio_buffer_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
- mlt_properties_set_data( properties, "audio_buffer", audio_buffer, 0, NULL, NULL );
+ mlt_properties_set_data( properties, "audio_buffer", audio_buffer, 0, mlt_pool_release, NULL );
}
// Seek if necessary
// Now handle the audio if we have enough
if ( audio_used >= *samples )
{
- void *release = NULL;
- *buffer = mlt_pool_allocate( *samples * *channels * sizeof( int16_t ), &release );
+ *buffer = mlt_pool_alloc( *samples * *channels * sizeof( int16_t ) );
memcpy( *buffer, audio_buffer, *samples * *channels * sizeof( int16_t ) );
audio_used -= *samples;
memmove( audio_buffer, &audio_buffer[ *samples * *channels ], audio_used * *channels * sizeof( int16_t ) );
- mlt_properties_set_data( frame_properties, "audio_release", release, 0, ( mlt_destructor )mlt_pool_release, NULL );
- mlt_properties_set_data( frame_properties, "audio", *buffer, 0, NULL, NULL );
+ mlt_properties_set_data( frame_properties, "audio", *buffer, 0, mlt_pool_release, NULL );
}
else
{
- frame->get_audio = NULL;
mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
audio_used = 0;
}
else
{
// Get silence and don't touch the context
- frame->get_audio = NULL;
*samples = mlt_sample_calculator( fps, *frequency, position );
mlt_frame_get_audio( frame, buffer, format, frequency, channels, samples );
}
return 0;
}
-/** Set up audio handling.
-*/
-
-static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
-{
- // Get the properties
- mlt_properties properties = mlt_frame_properties( frame );
-
- // Set the audio method
- frame->get_audio = producer_get_audio;
-
- // Set the producer on the frame
- mlt_properties_set_data( properties, "vorbis_producer", this, 0, NULL, NULL );
-}
-
/** Our get frame implementation.
*/
static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
{
// Create an empty frame
- *frame = mlt_frame_init( );
+ *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
// 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_set_position( mlt_frame_properties( *frame ), "vorbis_position", mlt_producer_get_in( this ) + mlt_producer_position( this ) );
+ mlt_properties frame_properties = MLT_FRAME_PROPERTIES( *frame );
+ mlt_properties_set_position( frame_properties, "vorbis_position", mlt_producer_frame( this ) );
// Set up the audio
- producer_set_up_audio( this, *frame );
+ 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" );
// Calculate the next timecode
mlt_producer_prepare_next( this );