/*****************************************************************************
* 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"
-#if TAGLIB_VERSION >= VERSION_INT(1,6,0)
-# define TAGLIB_HAVE_AIFF_WAV_H
-# include <aifffile.h>
-# include <wavfile.h>
-#else
-# include <id3v2tag.h>
-#endif
+#include <aifffile.h>
+#include <wavfile.h>
-#if TAGLIB_VERSION >= VERSION_INT(1,6,1) && defined(TAGLIB_WITH_MP4)
-# define TAGLIB_HAVE_MP4COVERTART_H
+#if defined(TAGLIB_WITH_MP4)
# include <mp4file.h>
#endif
using namespace TagLib;
+static void ExtractTrackNumberValues( vlc_meta_t* p_meta, const char *psz_value )
+{
+ unsigned int i_trknum, i_trktot;
+ if( sscanf( psz_value, "%u/%u", &i_trknum, &i_trktot ) == 2 )
+ {
+ char psz_trck[11];
+ snprintf( psz_trck, sizeof( psz_trck ), "%u", i_trknum );
+ vlc_meta_SetTrackNum( p_meta, psz_trck );
+ snprintf( psz_trck, sizeof( psz_trck ), "%u", i_trktot );
+ vlc_meta_Set( p_meta, vlc_meta_TrackTotal, psz_trck );
+ }
+}
/**
* Read meta information from APE tags
* @param p_demux_meta: the demuxer meta
* @param p_meta: the meta
*/
-static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t*, vlc_meta_t* p_meta )
+static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
{
APE::Item item;
+
+ item = tag->itemListMap()["COVER ART (FRONT)"];
+ if( !item.isEmpty() )
+ {
+ input_attachment_t *p_attachment;
+
+ const ByteVector picture = item.value();
+ const char *p_data = picture.data();
+ unsigned i_data = picture.size();
+
+ size_t desc_len = strnlen(p_data, i_data);
+ if (desc_len < i_data) {
+ const char *psz_name = p_data;
+ 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 );
+
+ p_attachment = vlc_input_attachment_New( "cover", "image/jpeg",
+ 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" );
+ }
+ }
+
#define SET( keyName, metaName ) \
item = tag->itemListMap()[keyName]; \
if( !item.isEmpty() ) vlc_meta_Set##metaName( p_meta, item.toString().toCString( true ) ); \
+ SET( "ALBUM", Album );
+ SET( "ARTIST", Artist );
+ SET( "COMMENT", Description );
+ SET( "GENRE", Genre );
+ SET( "TITLE", Title );
SET( "COPYRIGHT", Copyright );
SET( "LANGUAGE", Language );
SET( "PUBLISHER", Publisher );
#undef SET
+
+ /* */
+ item = tag->itemListMap()["TRACK"];
+ if( !item.isEmpty() )
+ {
+ ExtractTrackNumberValues( p_meta, item.toString().toCString( true ) );
+ }
}
#undef SET
+ /* */
+ list = tag->frameListMap()["TRCK"];
+ if( !list.isEmpty() )
+ {
+ ExtractTrackNumberValues( p_meta, (*list.begin())->toString().toCString( true ) );
+ }
+
/* Preferred type of image
* The 21 types are defined in id3v2 standard:
* http://www.id3.org/id3v2.4.0-frames */
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 ) );
SET( "COPYRIGHT", Copyright );
+ SET( "ORGANIZATION", Publisher );
+ SET( "DATE", Date );
+ SET( "ENCODER", EncodedBy );
+ SET( "RATING", Rating );
+ SET( "LANGUAGE", Language );
#undef SET
+ 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" ];
StringList art_list = tag->fieldListMap()[ "COVERART" ];
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 );
+ }
}
}
-#ifdef TAGLIB_HAVE_MP4COVERTART_H
+#if defined(TAGLIB_WITH_MP4)
/**
* Read the meta information from mp4 specific tags
* @param tag: the mp4 tag
if( !psz_path )
return VLC_ENOMEM;
-#if defined(WIN32) || defined (UNDER_CE)
+#if defined(_WIN32)
wchar_t *wpath = ToWide( psz_path );
if( wpath == NULL )
{
else if( flac->xiphComment() )
ReadMetaFromXiph( flac->xiphComment(), p_demux_meta, p_meta );
}
-#ifdef TAGLIB_HAVE_MP4COVERTART_H
+#if defined(TAGLIB_WITH_MP4)
else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
{
if( mp4->tag() )
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
}
-#ifdef TAGLIB_HAVE_AIFF_WAV_H
else if( dynamic_cast<RIFF::File*>(f.file()) )
{
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
ReadMetaFromId3v2( riff_wav->tag(), p_demux_meta, p_meta );
}
-#endif
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
{
if( trueaudio->ID3v2Tag() )
WRITE( Publisher, "TPUB" );
#undef WRITE
+ /* Track Total as Custom Field */
+ psz_meta = input_item_GetTrackTotal( p_item );
+ if ( psz_meta )
+ {
+ ID3v2::FrameList list = tag->frameListMap()["TXXX"];
+ 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 ), "TRACKTOTAL" ) )
+ {
+ 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( "TRACKTOTAL" );
+ p_txxx->setText( psz_meta );
+ free( psz_meta );
+ tag->addFrame( p_txxx );
+ }
+ }
+
+ /* 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" );
#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
}
-#ifdef TAGLIB_HAVE_AIFF_WAV_H
else if( dynamic_cast<RIFF::File*>(f.file()) )
{
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
WriteMetaToId3v2( riff_wav->tag(), p_item );
}
-#endif
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
{
if( trueaudio->ID3v2Tag() )
projects / vlc / blobdiff