X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fvorbis%2Fproducer_vorbis.c;h=0094822022482e7d5fbda4aaf192672266ae26fb;hb=dbd3f9cca7b7c426d8a30ac7465c2374c603f7cf;hp=744ef977525f57f85b45a22167504901da55933b;hpb=0029e65e7570def50920e6cc094a9e1c9b7d9a9b;p=melted

diff --git a/src/modules/vorbis/producer_vorbis.c b/src/modules/vorbis/producer_vorbis.c
index 744ef97..0094822 100644
--- a/src/modules/vorbis/producer_vorbis.c
+++ b/src/modules/vorbis/producer_vorbis.c
@@ -3,19 +3,19 @@
  * 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
@@ -36,6 +36,35 @@
 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.
 */
 
@@ -118,6 +147,16 @@ static int producer_open( mlt_producer this, char *file )
 			// 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
@@ -129,6 +168,11 @@ static int producer_open( mlt_producer this, char *file )
 				// 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
@@ -307,15 +351,19 @@ static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index
 	*frame = mlt_frame_init( );
 
 	// Update timecode on the frame we're creating
-	mlt_frame_set_position( *frame, mlt_producer_frame( this ) );
+	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_frame( 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
 	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 );