* modules/demux/ogg.c: provide some file info. Tested with the tarzan.ogm

[vlc] / modules / codec / vorbis.c

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 8759a1b3cb2d849f44bed9ce73fb661a5cae1159..0a138059238a0509d5b94f6fd3d3398ae33a1915 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -2,7 +2,7 @@
  * vorbis.c: vorbis decoder module making use of libvorbis.
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vorbis.c,v 1.7 2002/11/21 21:37:46 gbazin Exp $
+ * $Id: vorbis.c,v 1.9 2002/12/19 23:23:25 sigmunau Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -110,7 +110,11 @@ static void Interleave   ( float *, const float **, int, int );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Vorbis decoder module") );
+#ifdef MODULE_NAME_IS_tremor
+    set_capability( "decoder", 90 );
+#else
     set_capability( "decoder", 100 );
+#endif
     set_callbacks( OpenDecoder, NULL );
 vlc_module_end();
 
@@ -178,7 +182,26 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
         msg_Err( p_dec->p_fifo, "2nd Vorbis header is corrupted" );
         goto error;
     }
-
+    /* parse the vorbis comment */
+    {
+        input_thread_t *p_input = p_fifo->p_parent;
+        input_info_category_t *p_cat = input_InfoCategory( p_input,
+                                                           "Vorbis Comment" );
+        int i = 0;
+        char *psz_name, *psz_value, *psz_comment;
+        while ( i < p_dec->vc.comments )
+        {
+            psz_comment = strdup( p_dec->vc.user_comments[i] );
+            psz_name = psz_comment;
+            psz_value = strchr( psz_comment, '=' );
+            *psz_value = '\0';
+            psz_value++;
+            input_AddInfo( p_cat, psz_name, psz_value );
+            free( psz_comment );
+            i++;
+        }
+    }
+    
     if( GetOggPacket( p_dec, &oggpacket, &i_pts ) != VLC_SUCCESS )
         goto error;