]> git.sesse.net Git - vlc/blobdiff - modules/codec/vorbis.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removes trailing spaces. Removes tabs.
[vlc] / modules / codec / vorbis.c
diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 2c8cbcaa3452330979a3ea51033e32e9d8add901..acc74d0faac547c838122b87de76b51323784293 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -1,7 +1,10 @@
 /*****************************************************************************
- * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
+ * vorbis.c: vorbis decoder/encoder/packetizer module using of libvorbis.
  *****************************************************************************
  * Copyright (C) 2001-2003 the VideoLAN team
+ * Copyright (C) 2007 Société des arts technologiques
+ * Copyright (C) 2007 Savoir-faire Linux
+ *
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -78,13 +81,15 @@ struct decoder_sys_t
     audio_date_t end_date;
     int          i_last_block_size;
 
+    int i_input_rate;
+
     /*
     ** Channel reordering
     */
     int pi_chan_table[AOUT_CHAN_MAX];
 };
 
-static int pi_channels_maps[7] =
+static int pi_channels_maps[9] =
 {
     0,
     AOUT_CHAN_CENTER,
@@ -95,7 +100,13 @@ static int pi_channels_maps[7] =
     AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
      | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT,
     AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
-     | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE
+     | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE,
+    AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+     | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT
+     | AOUT_CHAN_MIDDLERIGHT,
+    AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT
+     | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT
+     | AOUT_CHAN_LFE
 };
 
 /*
@@ -104,7 +115,7 @@ static int pi_channels_maps[7] =
 
 /* recommended vorbis channel order for 6 channels */
 static const uint32_t pi_6channels_in[] =
-{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,  
+{ AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
   AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,AOUT_CHAN_LFE,0 };
 
 /* recommended vorbis channel order for 4 channels */
@@ -190,7 +201,7 @@ vlc_module_begin();
     set_description( _("Vorbis audio encoder") );
     set_capability( "encoder", 100 );
 #if defined(HAVE_VORBIS_VORBISENC_H)
-       set_callbacks( OpenEncoder, CloseEncoder );
+    set_callbacks( OpenEncoder, CloseEncoder );
 #endif
 
     add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT,
@@ -237,6 +248,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_sys->i_last_block_size = 0;
     p_sys->b_packetizer = VLC_FALSE;
     p_sys->i_headers = 0;
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
 
     /* Take care of vorbis init */
     vorbis_info_init( &p_sys->vi );
@@ -291,6 +303,9 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         /* Block to Ogg packet */
         oggpacket.packet = (*pp_block)->p_buffer;
         oggpacket.bytes = (*pp_block)->i_buffer;
+
+        if( (*pp_block)->i_rate > 0 )
+            p_sys->i_input_rate = (*pp_block)->i_rate;
     }
     else
     {
@@ -389,10 +404,9 @@ static int ProcessHeaders( decoder_t *p_dec )
     p_dec->fmt_out.audio.i_rate     = p_sys->vi.rate;
     p_dec->fmt_out.audio.i_channels = p_sys->vi.channels;
 
-    if( p_dec->fmt_out.audio.i_channels < 0 ||
-        p_dec->fmt_out.audio.i_channels > 6 )
+    if( p_dec->fmt_out.audio.i_channels > 9 )
     {
-        msg_Err( p_dec, "invalid number of channels (not between 1 and 6): %i",
+        msg_Err( p_dec, "invalid number of channels (not between 1 and 9): %i",
                  p_dec->fmt_out.audio.i_channels );
         return VLC_EGENERIC;
     }
@@ -403,7 +417,6 @@ static int ProcessHeaders( decoder_t *p_dec )
     p_dec->fmt_out.i_bitrate = p_sys->vi.bitrate_nominal;
 
     aout_DateInit( &p_sys->end_date, p_sys->vi.rate );
-    aout_DateSet( &p_sys->end_date, 0 );
 
     msg_Dbg( p_dec, "channels:%d samplerate:%ld bitrate:%ld",
              p_sys->vi.channels, p_sys->vi.rate, p_sys->vi.bitrate_nominal );
@@ -563,7 +576,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
         /* Date management */
         p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
         p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date,
-                                                      i_samples );
+                                                      i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
         return p_aout_buffer;
     }
     else
@@ -590,8 +603,9 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
     p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date );
 
     if( p_sys->i_headers >= 3 )
-        p_block->i_length = aout_DateIncrement( &p_sys->end_date, i_samples ) -
-            p_block->i_pts;
+        p_block->i_length = aout_DateIncrement( &p_sys->end_date,
+            i_samples * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) -
+                p_block->i_pts;
     else
         p_block->i_length = 0;
 
@@ -599,7 +613,7 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket,
 }
 
 /*****************************************************************************
- * ParseVorbisComments: FIXME should be done in demuxer
+ * ParseVorbisComments
  *****************************************************************************/
 static void ParseVorbisComments( decoder_t *p_dec )
 {
@@ -628,12 +642,12 @@ static void ParseVorbisComments( decoder_t *p_dec )
             psz_value++;
             input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"),
                            psz_name, "%s", psz_value );
+#ifndef HAVE_TAGLIB
             if( !strcasecmp( psz_name, "artist" ) )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetArtist( p_item->p_meta,
-                                        psz_value );
+                    input_item_SetArtist( p_item, psz_value );
                     input_ItemAddInfo( p_item,
                                         _(VLC_META_INFO_CAT),
                                         _(VLC_META_ARTIST),
@@ -644,8 +658,7 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetTitle( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetTitle( p_item, psz_value );
                     p_item->psz_name = strdup( psz_value );
                 }
             }
@@ -653,16 +666,14 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetAlbum( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetAlbum( p_item, psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "musicbrainz_trackid" ) )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetTrackID( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetTrackID( p_item, psz_value );
                 }
             }
 #if 0 //not used
@@ -670,19 +681,49 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetArtistID( p_item->p_meta,
-                                    psz_value );
+                    vlc_meta_SetArtistID( p_item, psz_value );
                 }
             }
             else if( !strcasecmp( psz_name, "musicbrainz_albumid" ) )
             {
                 if( psz_value && ( *psz_value != '\0' ) )
                 {
-                    vlc_meta_SetAlbumID( p_item->p_meta,
-                                    psz_value );
+                    input_item_SetAlbumID( p_item, psz_value );
                 }
             }
 #endif
+#endif
+            if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
+                     !strcasecmp( psz_name, "RG_RADIO" ) )
+            {
+                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+                r->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+                r->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+            }
+            else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) ||
+                     !strcasecmp( psz_name, "RG_PEAK" ) )
+            {
+                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+                r->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+                r->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+            }
+            else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) ||
+                     !strcasecmp( psz_name, "RG_AUDIOPHILE" ) )
+            {
+                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+                r->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+                r->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+            }
+            else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) )
+            {
+                audio_replay_gain_t *r = &p_dec->fmt_out.audio_replay_gain;
+
+                r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+                r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+            }
         }
         /* FIXME */
         var_SetInteger( p_input, "item-change", p_item->i_id );
Unnamed repository; edit this file 'description' to name the repository.