Changeset 8e3c06e49467efff48dea25c24c0baab7126b79f

Timestamp:

17/06/07 15:47:00 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1182088020 +0000

git-parent:

[1e900bf8cab23a83e70f5b56d2e9295a359cffee]

git-author:

Laurent Aimar <fenrir@videolan.org> 1182088020 +0000

Message:

Added APEv1/2 support to id3tag.c
Parse TXXX fields (id3)
Parse RVA2 and convert them to replay gain (id3)
(I cannot put APE parsing into a new module as id3 and ape can be found
in the same file, this means you need libid3tag)

Files:

• modules/meta_engine/id3tag.c (modified) (6 diffs)

modules/meta_engine/id3tag.c

@@ -1 +1 @@
-/*****************************************************************************
-
+/ape
- *****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
@@ -45 +45 @@
- * Local prototypes
- *****************************************************************************/
-ID3
+
-
-/*****************************************************************************
@@ -51 +51 @@
- *****************************************************************************/
-vlc_module_begin();
-
+v1/2 and APEv1/2
-    set_capability( "meta reader", 70 );
-ID3
+
-vlc_module_end();
-
-/*****************************************************************************
- * Definitions of structures  and functions used by this plugins
- *****************************************************************************/
-
-/*****************************************************************************
@@ -67 +63 @@
-    struct id3_tag   *p_id3_tag;
-    struct id3_frame *p_frame;
-
+
+
-
-    p_id3_tag = id3_tag_parse( p_data, i_size );
-
-
-
-
-
+
+
+
+
+
+
-#define ID_IS( a ) (!strcmp(  p_frame->id, a ))
-#define DESCR_IS( a) strstr( (char*)p_frame->description, a )
-
-
-
-
+
+
+
+
+
+
-
-        if( !strncmp( psz_owner, "http://musicbrainz.org", 22 ) )
@@ -96 +96 @@
-            free( psz_ufid );
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        while( i_strings > 0 )
-        {
@@ -194 +225 @@
-            }
-            else if( p_frame->description )
-
-
+
+
+
-            }
-            free( psz_temp );
-        }
-        i++;
-    }
-    id3_tag_delete( p_id3_tag );
+#undef GET_STRING
+#undef DESCR_IS
+#undef ID_IS
-}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ****************************************************************************/
-ID3
+
-{
-    demux_t *p_demux = (demux_t *)p_this;
-    uint8_t *p_peek;
-    vlc_bool_t b_seekable;
-
-
+
-
-    p_demux->p_private = NULL;
-
- tag
+v1/2 and APEv1/2 tags
-
-    stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
-
+
+
-
-    i_init = stream_Tell( p_demux->s );
-
-
-
+
+
+
+
+
+
+
+
+
-     */
-    i_init = stream_Tell( p_demux->s );
-    i_pos = stream_Size( p_demux->s );
-
-    while( i_pos > 128 ) /* while used so we can break; */
-    {
-        stream_Seek( p_demux->s, i_pos - 128 );
-
-        /* get 10 byte id3 header */
-        if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) break;
-
-        i_size = id3_tag_query( p_peek, 10 );
-        if( i_size == 128 )
-        {
-            /* peek the entire tag */
-            if( stream_Peek( p_demux->s, &p_peek, i_size ) < i_size ) break;
-
-            msg_Dbg( p_demux, "found ID3v1 tag" );
-            ParseID3Tag( p_demux, p_peek, i_size );
-        }
-
-        /* 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;
-
-        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 );
-        }
-        break;
-    }
-
-    /*
-     * Get 10 byte id3 header
-     */
-    stream_Seek( p_demux->s, 0 );
-    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) goto end;
-
-    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 );
-
- end:
-    stream_Seek( p_demux->s, i_init );
-    return VLC_SUCCESS;