X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmeta_engine%2Ftaglib.cpp;h=f67dbdafd8e9ec8d44de088862b2a13f1891efbb;hb=0777f8120a5148339bd7e4403db20e154c2b6d51;hp=227ed04f758b626fd8378c084f7be0a341b932a8;hpb=28caaf85ca6eb13f9d38cc4863f86f0fea397440;p=vlc diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 227ed04f75..f67dbdafd8 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -29,12 +29,13 @@ #include #include -#include #include #include #include #include #include +#include +#include /* for attachment_new */ #ifdef WIN32 # include @@ -57,6 +58,16 @@ #include #include #include + +#ifdef TAGLIB_WITH_ASF +# include +# include +#endif + +#ifdef TAGLIB_WITH_MP4 +# include +#endif + #include #include #include @@ -66,6 +77,8 @@ #include #include +// taglib is not thread safe +static vlc_mutex_t taglib_lock = VLC_STATIC_MUTEX; // Local functions static int ReadMeta ( vlc_object_t * ); @@ -83,7 +96,7 @@ using namespace TagLib; /** - * Read meta informations from APE tags + * Read meta information from APE tags * @param tag: the APE tag * @param p_demux; the demux object * @param p_demux_meta: the demuxer meta @@ -121,6 +134,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* { ID3v2::UniqueFileIdentifierFrame* p_ufid = dynamic_cast(*iter); + if( !p_ufid ) + continue; const char *owner = p_ufid->owner().toCString(); if (!strcmp( owner, "http://musicbrainz.org" )) { @@ -141,11 +156,13 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* { ID3v2::UserTextIdentificationFrame* p_txxx = dynamic_cast(*iter); + if( !p_txxx ) + continue; vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ), p_txxx->fieldList().toString().toCString( true ) ); } - // Get some more informations + // Get some more information #define SET( tagName, metaName ) \ list = tag->frameListMap()[tagName]; \ if( !list.isEmpty() ) \ @@ -185,6 +202,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* 3, /* Logo of the band or performer. */ 2 /* Logo of the publisher (record company). */ }; + #define PI_COVER_SCORE_SIZE (sizeof (pi_cover_score) / sizeof (pi_cover_score[0])) int i_score = -1; // Try now to get embedded art @@ -197,6 +215,8 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* { ID3v2::AttachedPictureFrame* p_apic = dynamic_cast(*iter); + if( !p_apic ) + continue; input_attachment_t *p_attachment; const char *psz_mime; @@ -224,7 +244,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* if( !strncmp( psz_mime, "PNG", 3 ) || !strncmp( psz_name, "\xC2\x89PNG", 5 ) ) { - msg_Warn( p_demux, "Invalid picture embedded by broken iTunes version" ); + msg_Warn( p_demux_meta, "Invalid picture embedded by broken iTunes version" ); free( psz_description ); continue; } @@ -233,7 +253,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* const char *p_data = picture.data(); const unsigned i_data = picture.size(); - msg_Dbg( p_demux, "Found embedded art: %s (%s) is %u bytes", + msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %u bytes", psz_name, psz_mime, i_data ); p_attachment = vlc_input_attachment_New( psz_name, psz_mime, @@ -244,9 +264,13 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* p_attachment ); free( psz_description ); - if( pi_cover_score[p_apic->type()] > i_score ) + unsigned i_pic_type = p_apic->type(); + if( i_pic_type >= PI_COVER_SCORE_SIZE ) + i_pic_type = 0; // Defaults to "Other" + + if( pi_cover_score[i_pic_type] > i_score ) { - i_score = pi_cover_score[p_apic->type()]; + i_score = pi_cover_score[i_pic_type]; char *psz_url; if( asprintf( &psz_url, "attachment://%s", p_attachment->psz_name ) == -1 ) @@ -260,7 +284,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_t* p_demux, demux_meta_t* /** - * Read the meta informations from XiphComments + * Read the meta information from XiphComments * @param tag: the Xiph Comment * @param p_demux; the demux object * @param p_demux_meta: the demuxer meta @@ -282,7 +306,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met // We get only the first covert art if( mime_list.size() > 1 || art_list.size() > 1 ) - msg_Warn( p_demux, "Found %i embedded arts, so using only the first one", + msg_Warn( p_demux_meta, "Found %i embedded arts, so using only the first one", art_list.size() ); else if( mime_list.size() == 0 || art_list.size() == 0 ) return; @@ -296,7 +320,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met uint8_t *p_data; int i_data = vlc_b64_decode_binary( &p_data, art_list[0].toCString(true) ); - msg_Dbg( p_demux, "Found embedded art: %s (%s) is %i bytes", + msg_Dbg( p_demux_meta, "Found embedded art: %s (%s) is %i bytes", psz_name, psz_mime, i_data ); TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments ); @@ -311,7 +335,28 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met vlc_meta_SetArtURL( p_meta, "attachment://cover" ); } - +#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H) +static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta ) +{ + if( tag->itemListMap().contains("covr") ) + { + MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList(); + const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg"; + + 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() ); + TAB_APPEND_CAST( (input_attachment_t**), + p_demux_meta->i_attachments, p_demux_meta->attachments, + p_attachment ); + vlc_meta_SetArtURL( p_meta, "attachment://cover" ); + } +} +#endif /** * Get the tags from the file using TagLib @@ -320,27 +365,40 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met */ static int ReadMeta( vlc_object_t* p_this) { - demux_t* p_demux = (demux_t*)p_this; - demux_meta_t* p_demux_meta = (demux_meta_t*)p_demux->p_private; + vlc_mutex_locker locker (&taglib_lock); + demux_meta_t* p_demux_meta = (demux_meta_t *)p_this; + demux_t* p_demux = p_demux_meta->p_demux; vlc_meta_t* p_meta; FileRef f; p_demux_meta->p_meta = NULL; + if( strcmp( p_demux->psz_access, "file" ) ) + return VLC_EGENERIC; + char *psz_path = strdup( p_demux->psz_file ); + if( !psz_path ) + return VLC_ENOMEM; #if defined(WIN32) || defined (UNDER_CE) wchar_t wpath[MAX_PATH + 1]; - if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) ) + if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) ) + { + free( psz_path ); return VLC_EGENERIC; + } wpath[MAX_PATH] = L'\0'; f = FileRef( wpath ); #else - const char* local_name = ToLocale( p_demux->psz_path ); + const char* local_name = ToLocale( psz_path ); if( !local_name ) + { + free( psz_path ); return VLC_EGENERIC; + } f = FileRef( local_name ); LocaleFree( local_name ); #endif + free( psz_path ); if( f.isNull() ) return VLC_EGENERIC; @@ -386,6 +444,13 @@ static int ReadMeta( vlc_object_t* p_this) else if( flac->xiphComment() ) ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta ); } +#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H) + else if( MP4::File *mp4 = dynamic_cast(f.file()) ) + { + if( mp4->tag() ) + ReadMetaFromMP4( mp4->tag(), p_demux, p_demux_meta, p_meta ); + } +#endif else if( MPC::File* mpc = dynamic_cast(f.file()) ) { if( mpc->APETag() ) @@ -407,6 +472,15 @@ static int ReadMeta( vlc_object_t* p_this) else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast(f.file()) ) ReadMetaFromXiph( ogg_vorbis->tag(), p_demux, p_demux_meta, p_meta ); } +#ifdef TAGLIB_WITH_ASF + else if( RIFF::File* riff = dynamic_cast(f.file()) ) + { + if( RIFF::AIFF::File* riff_aiff = dynamic_cast(f.file()) ) + ReadMetaFromId3v2( riff_aiff->tag(), p_demux, p_demux_meta, p_meta ); + else if( RIFF::WAV::File* riff_wav = dynamic_cast(f.file()) ) + ReadMetaFromId3v2( riff_wav->tag(), p_demux, p_demux_meta, p_meta ); + } +#endif else if( TrueAudio::File* trueaudio = dynamic_cast(f.file()) ) { if( trueaudio->ID3v2Tag() ) @@ -424,7 +498,7 @@ static int ReadMeta( vlc_object_t* p_this) /** - * Write meta informations to APE tags + * Write meta information to APE tags * @param tag: the APE tag * @param p_item: the input item */ @@ -482,7 +556,7 @@ static void WriteMetaToId3v2( ID3v2::Tag* tag, input_item_t* p_item ) /** - * Write the meta informations to XiphComments + * Write the meta information to XiphComments * @param tag: the Xiph Comment * @param p_input: the input item */ @@ -514,8 +588,8 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item ) static int WriteMeta( vlc_object_t *p_this ) { - playlist_t *p_playlist = (playlist_t *)p_this; - meta_export_t *p_export = (meta_export_t *)p_playlist->p_private; + vlc_mutex_locker locker (&taglib_lock); + meta_export_t *p_export = (meta_export_t *)p_this; input_item_t *p_item = p_export->p_item; FileRef f; @@ -525,26 +599,16 @@ static int WriteMeta( vlc_object_t *p_this ) return VLC_EGENERIC; } - char *export_file = strdup(p_export->psz_file); - if( decode_URI( export_file ) == NULL ) - { - free( export_file ); - return VLC_EGENERIC; - } - #if defined(WIN32) || defined (UNDER_CE) wchar_t wpath[MAX_PATH + 1]; - if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -1, wpath, MAX_PATH) ) + if( !MultiByteToWideChar( CP_UTF8, 0, p_export->psz_file, -1, wpath, MAX_PATH) ) return VLC_EGENERIC; wpath[MAX_PATH] = L'\0'; f = FileRef( wpath ); #else - const char* local_name = ToLocale( export_file ); + const char* local_name = ToLocale( p_export->psz_file ); if( !local_name ) - { - free( export_file ); return VLC_EGENERIC; - } f = FileRef( local_name ); LocaleFree( local_name ); #endif @@ -552,47 +616,32 @@ static int WriteMeta( vlc_object_t *p_this ) if( f.isNull() || !f.tag() || f.file()->readOnly() ) { msg_Err( p_this, "File %s can't be opened for tag writing", - export_file ); - free( export_file ); + p_export->psz_file ); return VLC_EGENERIC; } - msg_Dbg( p_this, "Writing metadata for %s", export_file ); - free( export_file ); + msg_Dbg( p_this, "Writing metadata for %s", p_export->psz_file ); Tag *p_tag = f.tag(); char *psz_meta; -#define SET( a, b ) \ - if( b ) \ - { \ - String* psz_tmp = new String( b, String::UTF8 ); \ - p_tag->set##a( *psz_tmp ); \ - delete psz_tmp; \ - } +#define SET( a, b ) \ + psz_meta = input_item_Get ## a( p_item ); \ + if( psz_meta ) \ + { \ + String tmp( psz_meta, String::UTF8 ); \ + p_tag->set##b( tmp ); \ + } \ + free( psz_meta ); // Saving all common fields // If the title is empty, use the name - psz_meta = input_item_GetTitleFbName( p_item ); - SET( Title, psz_meta ); - free( psz_meta ); - - psz_meta = input_item_GetArtist( p_item ); - SET( Artist, psz_meta ); - free( psz_meta ); - - psz_meta = input_item_GetAlbum( p_item ); - SET( Album, psz_meta ); - free( psz_meta ); - - psz_meta = input_item_GetDescription( p_item ); - SET( Comment, psz_meta ); - free( psz_meta ); - - psz_meta = input_item_GetGenre( p_item ); - SET( Genre, psz_meta ); - free( psz_meta ); + SET( TitleFbName, Title ); + SET( Artist, Artist ); + SET( Album, Album ); + SET( Description, Comment ); + SET( Genre, Genre ); #undef SET @@ -634,6 +683,15 @@ static int WriteMeta( vlc_object_t *p_this ) else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast(f.file()) ) WriteMetaToXiph( ogg_vorbis->tag(), p_item ); } +#ifdef TAGLIB_WITH_ASF + else if( RIFF::File* riff = dynamic_cast(f.file()) ) + { + if( RIFF::AIFF::File* riff_aiff = dynamic_cast(f.file()) ) + WriteMetaToId3v2( riff_aiff->tag(), p_item ); + else if( RIFF::WAV::File* riff_wav = dynamic_cast(f.file()) ) + WriteMetaToId3v2( riff_wav->tag(), p_item ); + } +#endif else if( TrueAudio::File* trueaudio = dynamic_cast(f.file()) ) { if( trueaudio->ID3v2Tag() )