/*****************************************************************************
* taglib.cpp: Taglib tag parser/writer
*****************************************************************************
- * Copyright (C) 2003-2011 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Rafaël Carré <funman@videolanorg>
* Rémi Duraffort <ivoire@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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include <vlc_demux.h> /* demux_meta_t */
#include <vlc_strings.h> /* vlc_b64_decode_binary */
#include <vlc_input.h> /* for attachment_new */
+#include <vlc_url.h> /* make_path */
+#include <vlc_mime.h> /* mime type */
+#include <vlc_fs.h>
-#ifdef WIN32
+#include <sys/stat.h>
+
+#ifdef _WIN32
# include <vlc_charset.h>
# include <io.h>
#else
// Taglib headers
+#ifdef _WIN32
+# define TAGLIB_STATIC
+#endif
#include <taglib.h>
#define VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c))
#define TAGLIB_VERSION VERSION_INT(TAGLIB_MAJOR_VERSION, \
# endif
#endif
+#if TAGLIB_VERSION >= VERSION_INT(1,9,0)
+# include <opusfile.h>
+#endif
+
#include <apetag.h>
#include <flacfile.h>
#include <mpcfile.h>
#include <mpegfile.h>
#include <oggfile.h>
#include <oggflacfile.h>
-#include "../demux/vorbis.h"
+#include "../demux/xiph_metadata.h"
#include <aifffile.h>
#include <wavfile.h>
*/
static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
{
- APE::Item item;
+ APE::ItemListMap fields ( tag->itemListMap() );
+ APE::ItemListMap::Iterator iter;
- item = tag->itemListMap()["COVER ART (FRONT)"];
- if( !item.isEmpty() )
+ iter = fields.find("COVER ART (FRONT)");
+ if( iter != fields.end()
+ && !iter->second.isEmpty()
+ && !iter->second.type() == APE::Item::Binary)
{
input_attachment_t *p_attachment;
- const ByteVector picture = item.value();
+ const ByteVector picture = iter->second.binaryData();
const char *p_data = picture.data();
unsigned i_data = picture.size();
+ /* Null terminated filename followed by the image data */
size_t desc_len = strnlen(p_data, i_data);
- if (desc_len < i_data) {
+ if( desc_len < i_data && IsUTF8( p_data ) )
+ {
const char *psz_name = p_data;
+ const char *psz_mime = vlc_mime_Ext2Mime( psz_name );
p_data += desc_len + 1; /* '\0' */
i_data -= desc_len + 1;
+
msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %u bytes",
- psz_name, "image/jpeg", i_data );
+ psz_name, psz_mime, i_data );
- p_attachment = vlc_input_attachment_New( "cover", "image/jpeg",
+ p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
psz_name, p_data, i_data );
if( p_attachment )
+ {
TAB_APPEND_CAST( (input_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
- vlc_meta_SetArtURL( p_meta, "attachment://cover" );
+ char *psz_url;
+ if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 )
+ {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
+ }
}
+
+ fields.erase(iter);
}
#define SET( keyName, metaName ) \
- item = tag->itemListMap()[keyName]; \
- if( !item.isEmpty() ) vlc_meta_Set##metaName( p_meta, item.toString().toCString( true ) ); \
+ iter = fields.find(keyName); \
+ if( iter != fields.end() && !iter->second.isEmpty() ) { \
+ vlc_meta_Set##metaName( p_meta, iter->second.toString().toCString( true ) ); \
+ fields.erase(iter); \
+ }
+
+#define SET_EXTRA( keyName, metaName ) \
+ iter = fields.find( keyName ); \
+ if( iter != fields.end() && !iter->second.isEmpty() ) { \
+ vlc_meta_AddExtra( p_meta, metaName, iter->second.toString().toCString( true ) ); \
+ fields.erase(iter); \
+ }
SET( "ALBUM", Album );
SET( "ARTIST", Artist );
SET( "COPYRIGHT", Copyright );
SET( "LANGUAGE", Language );
SET( "PUBLISHER", Publisher );
+ SET( "MUSICBRAINZ_TRACKID", TrackID );
+
+ SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
#undef SET
+#undef SET_EXTRA
/* */
- item = tag->itemListMap()["TRACK"];
- if( !item.isEmpty() )
+ iter = fields.find( "TRACK" );
+ if( iter != fields.end() && !iter->second.isEmpty() )
{
- ExtractTrackNumberValues( p_meta, item.toString().toCString( true ) );
+ ExtractTrackNumberValues( p_meta, iter->second.toString().toCString( true ) );
+ fields.erase( iter );
+ }
+
+ /* Remainings */
+ for( iter = fields.begin(); iter != fields.end(); ++iter )
+ {
+ if( iter->second.isEmpty() )
+ continue;
+
+ if( iter->second.type() != APE::Item::Text )
+ continue;
+
+ vlc_meta_AddExtra( p_meta,
+ iter->first.toCString( true ),
+ iter->second.toString().toCString( true ) );
}
}
-#ifdef TAGLIB_HAVE_ASFPICTURE_H
/**
- * Read meta information from APE tags
- * @param tag: the APE tag
+ * Read meta information from ASF tags
+ * @param tag: the ASF tag
* @param p_demux_meta: the demuxer meta
* @param p_meta: the meta
*/
static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
{
+
+ ASF::AttributeList list;
+#define SET( keyName, metaName ) \
+ if( tag->attributeListMap().contains(keyName) ) \
+ { \
+ list = tag->attributeListMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.front().toString().toCString( true ) ); \
+ }
+
+#define SET_EXTRA( keyName, metaName ) \
+ if( tag->attributeListMap().contains(keyName) ) \
+ { \
+ list = tag->attributeListMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.front().toString().toCString( true ) ); \
+ }
+
+ SET("MusicBrainz/Track Id", TrackID );
+ SET_EXTRA("MusicBrainz/Album Id", VLC_META_EXTRA_MB_ALBUMID );
+
+#undef SET
+#undef SET_EXTRA
+
+#ifdef TAGLIB_HAVE_ASFPICTURE_H
// List the pictures
- ASF::AttributeList list = tag->attributeListMap()["WM/Picture"];
+ list = tag->attributeListMap()["WM/Picture"];
ASF::AttributeList::Iterator iter;
for( iter = list.begin(); iter != list.end(); iter++ )
{
TAB_APPEND_CAST( (input_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments,
p_attachment );
- free( psz_name );
-
char *psz_url;
- if( asprintf( &psz_url, "attachment://%s",
- p_attachment->psz_name ) == -1 )
- continue;
- vlc_meta_SetArtURL( p_meta, psz_url );
- free( psz_url );
+ if( asprintf( &psz_url, "attachment://%s", psz_name ) != -1 )
+ {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
+ free( psz_name );
}
-}
#endif
+}
/**
vlc_meta_Set( p_meta, vlc_meta_TrackTotal, p_txxx->fieldList().back().toCString( true ) );
continue;
}
+ if( !strcmp( p_txxx->description().toCString( true ), "MusicBrainz Album Id" ) )
+ {
+ vlc_meta_AddExtra( p_meta, VLC_META_EXTRA_MB_ALBUMID, p_txxx->fieldList().back().toCString( true ) );
+ continue;
+ }
vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
p_txxx->fieldList().back().toCString( true ) );
}
if( list.isEmpty() )
return;
- TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
for( iter = list.begin(); iter != list.end(); iter++ )
{
ID3v2::AttachedPictureFrame* p_apic =
p_attachment = vlc_input_attachment_New( psz_name, psz_mime,
psz_description, p_data, i_data );
- if( p_attachment )
- TAB_APPEND_CAST( (input_attachment_t**),
- p_demux_meta->i_attachments, p_demux_meta->attachments,
- p_attachment );
+ if( !p_attachment )
+ {
+ free( psz_description );
+ continue;
+ }
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
free( psz_description );
unsigned i_pic_type = p_apic->type();
static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
{
StringList list;
+ bool hasTrackTotal = false;
#define SET( keyName, metaName ) \
list = tag->fieldListMap()[keyName]; \
if( !list.isEmpty() ) \
vlc_meta_Set##metaName( p_meta, (*list.begin()).toCString( true ) );
+#define SET_EXTRA( keyName, metaName ) \
+ list = tag->fieldListMap()[keyName]; \
+ if( !list.isEmpty() ) \
+ vlc_meta_AddExtra( p_meta, keyName, (*list.begin()).toCString( true ) );
+
SET( "COPYRIGHT", Copyright );
+ SET( "ORGANIZATION", Publisher );
+ SET( "DATE", Date );
+ SET( "ENCODER", EncodedBy );
+ SET( "RATING", Rating );
+ SET( "LANGUAGE", Language );
+ SET( "MUSICBRAINZ_TRACKID", TrackID );
+
+ SET_EXTRA( "MUSICBRAINZ_ALBUMID", VLC_META_EXTRA_MB_ALBUMID );
#undef SET
+#undef SET_EXTRA
+
+ list = tag->fieldListMap()["TRACKNUMBER"];
+ if( !list.isEmpty() )
+ {
+ const char *psz_value;
+ unsigned short u_track;
+ unsigned short u_total;
+ psz_value = (*list.begin()).toCString( true );
+ if( sscanf( psz_value, "%hu/%hu", &u_track, &u_total ) == 2)
+ {
+ char str[6];
+ snprintf(str, 6, "%u", u_track);
+ vlc_meta_SetTrackNum( p_meta, str);
+ snprintf(str, 6, "%u", u_total);
+ vlc_meta_SetTrackTotal( p_meta, str);
+ hasTrackTotal = true;
+ }
+ else
+ vlc_meta_SetTrackNum( p_meta, psz_value);
+ }
+ if( !hasTrackTotal )
+ {
+ list = tag->fieldListMap()["TRACKTOTAL"];
+ if( list.isEmpty() )
+ list = tag->fieldListMap()["TOTALTRACKS"];
+ if( !list.isEmpty() )
+ vlc_meta_SetTrackTotal( p_meta, (*list.begin()).toCString( true ) );
+ }
// Try now to get embedded art
StringList mime_list = tag->fieldListMap()[ "COVERARTMIME" ];
return;
uint8_t *p_data;
- int type;
+ int i_cover_score;
+ int i_cover_idx;
int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) );
- p_attachment = ParseFlacPicture( p_data, i_data, 0, &type );
+ i_cover_score = i_cover_idx = 0;
+ /* TODO: Use i_cover_score / i_cover_idx to select the picture. */
+ p_attachment = ParseFlacPicture( p_data, i_data, 0,
+ &i_cover_score, &i_cover_idx );
}
- TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
- TAB_APPEND_CAST( (input_attachment_t**),
- p_demux_meta->i_attachments, p_demux_meta->attachments,
- p_attachment );
+ if (p_attachment) {
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
- char *psz_url;
- if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) {
- vlc_meta_SetArtURL( p_meta, psz_url );
- free( psz_url );
+ char *psz_url;
+ if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) != -1 ) {
+ vlc_meta_SetArtURL( p_meta, psz_url );
+ free( psz_url );
+ }
}
}
*/
static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
{
+ MP4::Item list;
+#define SET( keyName, metaName ) \
+ if( tag->itemListMap().contains(keyName) ) \
+ { \
+ list = tag->itemListMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+#define SET_EXTRA( keyName, metaName ) \
+ if( tag->itemListMap().contains(keyName) ) \
+ { \
+ list = tag->itemListMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+ SET("----:com.apple.iTunes:MusicBrainz Track Id", TrackID );
+ SET_EXTRA("----:com.apple.iTunes:MusicBrainz Album Id", VLC_META_EXTRA_MB_ALBUMID );
+
+#undef SET
+#undef SET_EXTRA
+
if( tag->itemListMap().contains("covr") )
{
MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
psz_format, list[0].data().size() );
- TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
input_attachment_t *p_attachment =
vlc_input_attachment_New( "cover", psz_format, "cover",
list[0].data().data(), list[0].data().size() );
if( !psz_path )
return VLC_ENOMEM;
-#if defined(WIN32) || defined (UNDER_CE)
+#if defined(_WIN32)
wchar_t *wpath = ToWide( psz_path );
if( wpath == NULL )
{
#undef SETINT
#undef SET
+ TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
// Try now to read special tags
#ifdef TAGLIB_HAVE_APEFILE_H
}
else
#endif
-#ifdef TAGLIB_HAVE_ASFPICTURE_H
+#ifdef TAGLIB_WITH_ASF
if( ASF::File* asf = dynamic_cast<ASF::File*>(f.file()) )
{
if( asf->tag() )
}
else if( MPEG::File* mpeg = dynamic_cast<MPEG::File*>(f.file()) )
{
+ if( mpeg->APETag() )
+ ReadMetaFromAPE( mpeg->APETag(), p_demux_meta, p_meta );
if( mpeg->ID3v2Tag() )
ReadMetaFromId3v2( mpeg->ID3v2Tag(), p_demux_meta, p_meta );
- else if( mpeg->APETag() )
- ReadMetaFromAPE( mpeg->APETag(), p_demux_meta, p_meta );
}
else if( dynamic_cast<Ogg::File*>(f.file()) )
{
ReadMetaFromXiph( ogg_speex->tag(), p_demux_meta, p_meta );
else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
ReadMetaFromXiph( ogg_vorbis->tag(), p_demux_meta, p_meta );
+#if defined(TAGLIB_OPUSFILE_H)
+ else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
+ ReadMetaFromXiph( ogg_opus->tag(), p_demux_meta, p_meta );
+#endif
}
else if( dynamic_cast<RIFF::File*>(f.file()) )
{
WRITE( Copyright, "COPYRIGHT" );
WRITE( Language, "LANGUAGE" );
WRITE( Publisher, "PUBLISHER" );
-
+ WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
#undef WRITE
}
WRITE( Publisher, "TPUB" );
#undef WRITE
+ /* Known TXXX frames */
+ ID3v2::FrameList list = tag->frameListMap()["TXXX"];
+
+#define WRITETXXX( metaName, txxName )\
+ psz_meta = input_item_Get##metaName( p_item ); \
+ if ( psz_meta ) \
+ { \
+ ID3v2::UserTextIdentificationFrame *p_txxx; \
+ for( ID3v2::FrameList::Iterator iter = list.begin(); iter != list.end(); iter++ )\
+ { \
+ p_txxx = dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter); \
+ if( !p_txxx ) \
+ continue; \
+ if( !strcmp( p_txxx->description().toCString( true ), txxName ) ) \
+ { \
+ p_txxx->setText( psz_meta ); \
+ FREENULL( psz_meta ); \
+ break; \
+ } \
+ } \
+ if( psz_meta ) /* not found in existing custom fields */ \
+ { \
+ ByteVector p_byte( "TXXX", 4 ); \
+ p_txxx = new ID3v2::UserTextIdentificationFrame( p_byte ); \
+ p_txxx->setDescription( txxName ); \
+ p_txxx->setText( psz_meta ); \
+ free( psz_meta ); \
+ tag->addFrame( p_txxx ); \
+ } \
+ }
+
+ WRITETXXX( TrackTotal, "TRACKTOTAL" );
+
+#undef WRITETXXX
+
+ /* Write album art */
+ char *psz_url = input_item_GetArtworkURL( p_item );
+ if( psz_url == NULL )
+ return;
+
+ char *psz_path = make_path( psz_url );
+ free( psz_url );
+ if( psz_path == NULL )
+ return;
+
+ const char *psz_mime = vlc_mime_Ext2Mime( psz_path );
+
+ FILE *p_file = vlc_fopen( psz_path, "rb" );
+ if( p_file == NULL )
+ {
+ free( psz_path );
+ return;
+ }
+
+ struct stat st;
+ if( vlc_stat( psz_path, &st ) == -1 )
+ {
+ free( psz_path );
+ fclose( p_file );
+ return;
+ }
+ off_t file_size = st.st_size;
+
+ free( psz_path );
+
+ /* Limit picture size to 10MiB */
+ if( file_size > 10485760 )
+ {
+ fclose( p_file );
+ return;
+ }
+
+ char *p_buffer = new (std::nothrow) char[file_size];
+ if( p_buffer == NULL )
+ {
+ fclose( p_file );
+ return;
+ }
+
+ if( fread( p_buffer, 1, file_size, p_file ) != (unsigned)file_size )
+ {
+ fclose( p_file );
+ delete[] p_buffer;
+ return;
+ }
+ fclose( p_file );
+
+ ByteVector data( p_buffer, file_size );
+ delete[] p_buffer;
+
+ ID3v2::FrameList frames = tag->frameList( "APIC" );
+ ID3v2::AttachedPictureFrame *frame = NULL;
+ if( frames.isEmpty() )
+ {
+ frame = new TagLib::ID3v2::AttachedPictureFrame;
+ tag->addFrame( frame );
+ }
+ else
+ {
+ frame = static_cast<ID3v2::AttachedPictureFrame *>( frames.back() );
+ }
+
+ frame->setPicture( data );
+ frame->setMimeType( psz_mime );
}
} \
free( psz_meta );
+ WRITE( TrackNum, "TRACKNUMBER" );
+ WRITE( TrackTotal, "TRACKTOTAL" );
WRITE( Copyright, "COPYRIGHT" );
-
+ WRITE( Publisher, "ORGANIZATION" );
+ WRITE( Date, "DATE" );
+ WRITE( EncodedBy, "ENCODER" );
+ WRITE( Rating, "RATING" );
+ WRITE( Language, "LANGUAGE" );
+ WRITE( TrackID, "MUSICBRAINZ_TRACKID" );
#undef WRITE
}
return VLC_EGENERIC;
}
-#if defined(WIN32) || defined (UNDER_CE)
+#if defined(_WIN32)
wchar_t *wpath = ToWide( p_export->psz_file );
if( wpath == NULL )
return VLC_EGENERIC;
psz_meta = input_item_GetDate( p_item );
if( !EMPTY_STR(psz_meta) ) p_tag->setYear( atoi( psz_meta ) );
+ else p_tag->setYear( 0 );
free( psz_meta );
psz_meta = input_item_GetTrackNum( p_item );
if( !EMPTY_STR(psz_meta) ) p_tag->setTrack( atoi( psz_meta ) );
+ else p_tag->setTrack( 0 );
free( psz_meta );
WriteMetaToXiph( ogg_speex->tag(), p_item );
else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
WriteMetaToXiph( ogg_vorbis->tag(), p_item );
+#if defined(TAGLIB_OPUSFILE_H)
+ else if( Ogg::Opus::File* ogg_opus = dynamic_cast<Ogg::Opus::File*>(f.file()) )
+ WriteMetaToXiph( ogg_opus->tag(), p_item );
+#endif
}
else if( dynamic_cast<RIFF::File*>(f.file()) )
{
return VLC_SUCCESS;
}
-
projects / vlc / blobdiff