"Allows you to force a constant bitrate encoding (CBR)." )
vlc_module_begin();
-
+ set_shortname( _("Vorbis"));
set_description( _("Vorbis audio decoder") );
#ifdef MODULE_NAME_IS_tremor
set_capability( "decoder", 90 );
#else
set_capability( "decoder", 100 );
#endif
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
add_submodule();
set_description( _("Vorbis audio encoder") );
set_capability( "encoder", 100 );
- set_callbacks( OpenEncoder, CloseEncoder );
+#if defined(HAVE_VORBIS_VORBISENC_H)
+ set_callbacks( OpenEncoder, CloseEncoder );
+#endif
add_integer( ENC_CFG_PREFIX "quality", 3, NULL, ENC_QUALITY_TEXT,
ENC_QUALITY_LONGTEXT, VLC_FALSE );
/* Misc init */
aout_DateSet( &p_sys->end_date, 0 );
+ p_sys->i_last_block_size = 0;
p_sys->b_packetizer = VLC_FALSE;
p_sys->i_headers = 0;
p_dec->fmt_in.p_extra =
realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra +
oggpacket.bytes + 2 );
- p_extra = p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra;
+ p_extra = (uint8_t *)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra;
*(p_extra++) = oggpacket.bytes >> 8;
*(p_extra++) = oggpacket.bytes & 0xFF;
#endif
if( p_oggpacket->bytes &&
+#ifdef MODULE_NAME_IS_tremor
+ vorbis_synthesis( &p_sys->vb, p_oggpacket, 1 ) == 0 )
+#else
vorbis_synthesis( &p_sys->vb, p_oggpacket ) == 0 )
+#endif
vorbis_synthesis_blockin( &p_sys->vd, &p_sys->vb );
/* **pp_pcm is a multichannel float vector. In stereo, for
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" ) )
+ {
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ _("Artist"), psz_value );
+ }
+ else if( strstr( psz_name, "title" ) )
+ {
+ p_input->input.p_item->psz_name = strdup( psz_value );
+ }
}
+ /* FIXME */
+ var_SetInteger( p_input, "item-change", p_input->input.p_item->i_id );
free( psz_comment );
i++;
}
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave(
#ifdef MODULE_NAME_IS_tremor
- int32_t *p_out, const int32_t **pp_in,
+static void Interleave( int32_t *p_out, const int32_t **pp_in,
+ int i_nb_channels, int i_samples )
+{
+ int i, j;
+
+ for ( j = 0; j < i_samples; j++ )
+ for ( i = 0; i < i_nb_channels; i++ )
+ p_out[j * i_nb_channels + i] = pp_in[i][j] * (FIXED32_ONE >> 24);
+}
#else
- float *p_out, const float **pp_in,
-#endif
+static void Interleave( float *p_out, const float **pp_in,
int i_nb_channels, int i_samples )
{
int i, j;
for ( j = 0; j < i_samples; j++ )
- {
for ( i = 0; i < i_nb_channels; i++ )
- {
p_out[j * i_nb_channels + i] = pp_in[i][j];
- }
- }
}
+#endif
/*****************************************************************************
* CloseDecoder: vorbis decoder destruction