/*****************************************************************************
* id3tag.c: id3 tag parser/skipper based on libid3tag
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2004 the VideoLAN team
* $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
-set_description( _("ID3 tag parser using libid3tag" ) );
-set_capability( "id3", 70 );
-set_callbacks( ParseID3Tags, NULL );
+ set_description( _("ID3 tags parser" ) );
+ set_capability( "id3", 70 );
+ set_callbacks( ParseID3Tags, NULL );
vlc_module_end();
/*****************************************************************************
{
struct id3_tag *p_id3_tag;
struct id3_frame *p_frame;
- input_thread_t *p_input;
- vlc_value_t val;
int i = 0;
- p_input = vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
- if( !p_input) return;
-
- var_Get( p_input, "demuxed-id3", &val );
- if( val.b_bool )
- {
- msg_Dbg( p_demux, "the ID3 tag was already parsed" );
- vlc_object_release( p_input );
- return;
- }
-
- val.b_bool = VLC_TRUE;
- var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL );
-
p_id3_tag = id3_tag_parse( p_data, i_size );
if( !p_id3_tag ) return;
+ if( !p_demux->p_private ) p_demux->p_private = (void *)vlc_meta_New();
+
while( ( p_frame = id3_tag_findframe( p_id3_tag , "T", i ) ) )
{
int i_strings = id3_field_getnstrings( &p_frame->fields[1] );
while( i_strings > 0 )
{
+ vlc_meta_t *p_meta = (vlc_meta_t *)(p_demux->p_private);
+
char *psz_temp = id3_ucs4_utf8duplicate(
id3_field_getstrings( &p_frame->fields[1], --i_strings ) );
if( psz_temp != psz_endptr &&
i_genre >= 0 && i_genre < NUM_GENRES )
{
- vlc_meta_Add( (vlc_meta_t *)p_demux->p_private,
- VLC_META_GENRE, ppsz_genres[atoi(psz_temp)]);
+ vlc_meta_SetGenre( p_meta, ppsz_genres[atoi(psz_temp)]);
}
else
{
/* Unknown genre */
- vlc_meta_Add( (vlc_meta_t *)p_demux->p_private,
- VLC_META_GENRE, psz_temp );
+ vlc_meta_SetGenre( p_meta,psz_temp );
}
}
else if( !strcmp(p_frame->id, ID3_FRAME_TITLE ) )
{
- vlc_meta_Add( (vlc_meta_t *)p_demux->p_private,
- VLC_META_TITLE, psz_temp );
+ vlc_meta_SetTitle( p_meta, psz_temp );
}
else if( !strcmp(p_frame->id, ID3_FRAME_ARTIST ) )
{
- vlc_meta_Add( (vlc_meta_t *)p_demux->p_private,
- VLC_META_ARTIST, psz_temp );
+ vlc_meta_SetArtist( p_meta, psz_temp );
+ }
+ else if( !strcmp(p_frame->id, ID3_FRAME_YEAR ) )
+ {
+ vlc_meta_SetDate( p_meta, psz_temp );
+ }
+ else if( !strcmp(p_frame->id, ID3_FRAME_COMMENT ) )
+ {
+ vlc_meta_SetDescription( p_meta, psz_temp );
+ }
+ else if( strstr( (char*)p_frame->description, "Copyright" ) )
+ {
+ vlc_meta_SetCopyright( p_meta, psz_temp );
+ }
+ else if( strstr( (char*)p_frame->description, "Publisher" ) )
+ {
+ vlc_meta_SetPublisher( p_meta, psz_temp );
}
else
{
- /* Unknown meta info */
- vlc_meta_Add( (vlc_meta_t *)p_demux->p_private,
- (char *)p_frame->description, psz_temp );
+ msg_Err(p_demux, "Fixme: unhandled meta" );
}
free( psz_temp );
}
i++;
}
id3_tag_delete( p_id3_tag );
-
- vlc_object_release( p_input );
}
/*****************************************************************************
{
demux_t *p_demux = (demux_t *)p_this;
uint8_t *p_peek;
- int i_size;
- int i_size2;
vlc_bool_t b_seekable;
+ int64_t i_init, i_pos;
+ int i_size;
- p_demux->p_private = (void *)vlc_meta_New();
+ p_demux->p_private = NULL;
msg_Dbg( p_demux, "checking for ID3 tag" );
stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
- if( b_seekable )
+ if( !b_seekable ) return VLC_SUCCESS;
+
+ i_init = stream_Tell( p_demux->s );
+
+ /*
+ * Look for a ID3v1 tag at the end of the file
+ */
+ i_init = stream_Tell( p_demux->s );
+ i_pos = stream_Size( p_demux->s );
+
+ while( i_pos > 128 ) /* while used so we can break; */
{
- int64_t i_init;
- int64_t i_pos;
+ stream_Seek( p_demux->s, i_pos - 128 );
- /*look for a ID3v1 tag at the end of the file*/
- i_init = stream_Tell( p_demux->s );
- i_pos = stream_Size( p_demux->s );
+ /* get 10 byte id3 header */
+ if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) break;
- if ( i_pos >128 )
+ i_size = id3_tag_query( p_peek, 10 );
+ if( i_size == 128 )
{
- stream_Seek( p_demux->s, i_pos - 128 );
+ /* peek the entire tag */
+ if( stream_Peek( p_demux->s, &p_peek, i_size ) < i_size ) break;
- /* get 10 byte id3 header */
- if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
- {
- msg_Err( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
+ msg_Dbg( p_demux, "found ID3v1 tag" );
+ ParseID3Tag( p_demux, p_peek, i_size );
+ }
- i_size2 = id3_tag_query( p_peek, 10 );
- if ( i_size2 == 128 )
- {
- /* peek the entire tag */
- if ( stream_Peek( p_demux->s, &p_peek, i_size2 ) < i_size2 )
- {
- msg_Err( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
- msg_Dbg( p_demux, "found ID3v1 tag" );
- ParseID3Tag( p_demux, p_peek, i_size2 );
- }
+ /* look for ID3v2.4 tag at end of file */
+ /* get 10 byte ID3 footer */
+ if( stream_Peek( p_demux->s, &p_peek, 128 ) < 128 ) break;
- /* look for ID3v2.4 tag at end of file */
- /* get 10 byte ID3 footer */
- if( stream_Peek( p_demux->s, &p_peek, 128 ) < 128 )
- {
- msg_Err( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
- i_size2 = id3_tag_query( p_peek + 118, 10 );
- if ( i_size2 < 0 && i_pos > -i_size2 )
- { /* id3v2.4 footer found */
- stream_Seek( p_demux->s , i_pos + i_size2 );
- /* peek the entire tag */
- if ( stream_Peek( p_demux->s, &p_peek, i_size2 ) < i_size2 )
- {
- msg_Err( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
- msg_Dbg( p_demux, "found ID3v2 tag at end of file" );
- ParseID3Tag( p_demux, p_peek, i_size2 );
- }
+ i_size = id3_tag_query( p_peek + 118, 10 );
+ if( i_size < 0 && i_pos > -i_size )
+ {
+ /* id3v2.4 footer found */
+ stream_Seek( p_demux->s , i_pos + i_size );
+ /* peek the entire tag */
+ if( stream_Peek( p_demux->s, &p_peek, i_size ) < i_size ) break;
+
+ msg_Dbg( p_demux, "found ID3v2 tag at end of file" );
+ ParseID3Tag( p_demux, p_peek, i_size );
}
- stream_Seek( p_demux->s, i_init );
- }
- /* get 10 byte id3 header */
- if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
- {
- msg_Err( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
+ break;
}
- i_size = id3_tag_query( p_peek, 10 );
- if ( i_size <= 0 )
- {
- return VLC_SUCCESS;
- }
+ /*
+ * Get 10 byte id3 header
+ */
+ stream_Seek( p_demux->s, 0 );
+ if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) goto end;
- /* Read the entire tag */
- p_peek = malloc( i_size );
- if( !p_peek || stream_Read( p_demux->s, p_peek, i_size ) < i_size )
- {
- msg_Err( p_demux, "cannot read ID3 tag" );
- if( p_peek ) free( p_peek );
- return VLC_EGENERIC;
- }
+ if( (i_size = id3_tag_query( p_peek, 10 )) <= 0 ) goto end;
+
+ if( stream_Peek( p_demux->s, &p_peek, i_size ) < i_size ) goto end;
msg_Dbg( p_demux, "found ID3v2 tag" );
ParseID3Tag( p_demux, p_peek, i_size );
- free( p_peek );
+ end:
+ stream_Seek( p_demux->s, i_init );
return VLC_SUCCESS;
}
projects / vlc / blobdiff