/*****************************************************************************
* vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis.
*****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2001-2003 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* 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.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#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" );
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 )
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( strcasestr( psz_name, "artist" ) )
{
- input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
- _("Artist"), 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( strcasestr( psz_name, "title" ) )
{
p_input->input.p_item->psz_name = strdup( psz_value );
}
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 );