Fix voribis meta data stuff (so that it doesn't match on stuff like "MUSICBRAINZ_ARTIST")

[vlc] / modules / codec / vorbis.c

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index b2c91a3e1042eacdfa36770bdde9476f3c804f32..1064af0c8d7349b10da8689501232cc00a840a54 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2003 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,7 +18,7 @@
  *
  * 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, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -154,19 +154,17 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1 (low) and 10 (high), instead " \
+  "Enforce a quality between 1 (low) and 10 (high), instead " \
   "of specifying a particular bitrate. This will produce a VBR stream." )
 #define ENC_MAXBR_TEXT N_("Maximum encoding bitrate")
 #define ENC_MAXBR_LONGTEXT N_( \
-  "Allows you to specify a maximum bitrate in kbps. " \
-  "Useful for streaming applications." )
+  "Maximum bitrate in kbps. This is useful for streaming applications." )
 #define ENC_MINBR_TEXT N_("Minimum encoding bitrate")
 #define ENC_MINBR_LONGTEXT N_( \
-  "Allows you to specify a minimum bitrate in kbps. " \
-  "Useful for encoding for a fixed-size channel." )
+  "Minimum bitrate in kbps. This is useful for encoding for a fixed-size channel." )
 #define ENC_CBR_TEXT N_("CBR encoding")
 #define ENC_CBR_LONGTEXT N_( \
-  "Allows you to force a constant bitrate encoding (CBR)." )
+  "Force a constant bitrate encoding (CBR)." )
 
 vlc_module_begin();
     set_shortname( "Vorbis" );
@@ -194,7 +192,7 @@ vlc_module_begin();
        set_callbacks( OpenEncoder, CloseEncoder );
 #endif
 
-    add_integer( ENC_CFG_PREFIX "quality", 3, NULL, ENC_QUALITY_TEXT,
+    add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
                  ENC_QUALITY_LONGTEXT, VLC_FALSE );
     add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT,
                  ENC_MAXBR_LONGTEXT, VLC_FALSE );
@@ -311,6 +309,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra )
     {
         /* Headers already available as extra data */
+        msg_Dbg( p_dec, "headers already available as extra data" );
         p_sys->i_headers = 3;
     }
     else if( oggpacket.bytes && p_sys->i_headers < 3 )
@@ -616,16 +615,25 @@ static void ParseVorbisComments( decoder_t *p_dec )
             psz_value++;
             input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
                            psz_name, psz_value );
-            /* HACK, we should use meta */
-            if( strstr( psz_name, "artist" ) )
+            if( !strcasecmp( psz_name, "artist" ) )
             {
-                input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
-                               _("Artist"), psz_value );
+                vlc_meta_SetArtist( p_input->input.p_item->p_meta,
+                                    psz_value );
+                vlc_input_item_AddInfo( p_input->input.p_item,
+                                        _(VLC_META_INFO_CAT), _(VLC_META_ARTIST),
+                                        "%s", psz_value );
             }
-            else if( strstr( psz_name, "title" ) )
+            else if( !strcasecmp( psz_name, "title" ) )
             {
+                vlc_meta_SetTitle( p_input->input.p_item->p_meta,
+                                   psz_value );
                 p_input->input.p_item->psz_name = strdup( psz_value );
             }
+            else if( !strcasecmp( psz_name, "album" ) )
+            {
+                vlc_meta_SetAlbum( p_input->input.p_item->p_meta,
+                                   psz_value );
+            }
         }
         /* FIXME */
         var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id );
@@ -665,14 +673,14 @@ static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i
 
     if( b_decode )
         aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
-                                 i_channel_mask & AOUT_CHAN_PHYSMASK,
-                                 i_channels,
-                                 pi_chan_table );
+                                  i_channel_mask & AOUT_CHAN_PHYSMASK,
+                                  i_channels,
+                                  pi_chan_table );
     else
         aout_CheckChannelReorder( pi_channels_out, pi_channels_in,
-                                 i_channel_mask & AOUT_CHAN_PHYSMASK,
-                                 i_channels,
-                                 pi_chan_table );
+                                  i_channel_mask & AOUT_CHAN_PHYSMASK,
+                                  i_channels,
+                                  pi_chan_table );
 }
 
 /*****************************************************************************
@@ -708,7 +716,7 @@ static void CloseDecoder( vlc_object_t *p_this )
     decoder_t *p_dec = (decoder_t *)p_this;
     decoder_sys_t *p_sys = p_dec->p_sys;
 
-    if( !p_sys->b_packetizer && p_sys->i_headers >= 3 )
+    if( !p_sys->b_packetizer && p_sys->i_headers > 3 )
     {
         vorbis_block_clear( &p_sys->vb );
         vorbis_dsp_clear( &p_sys->vd );
@@ -909,8 +917,8 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
     {
         for( j = 0 ; j < p_aout_buf->i_nb_samples ; j++ )
         {
-            buffer[p_sys->pi_chan_table[i]][j]= ((float *)p_aout_buf->p_buffer)
-                                    [j * p_sys->i_channels + i ];
+            buffer[i][j]= ((float *)p_aout_buf->p_buffer)
+                                    [j * p_sys->i_channels + p_sys->pi_chan_table[i]];
         }
     }