1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
|
From: =?utf-8?q?Fran=C3=A7ois_Cartegnie?= <fcvlcdev@free.fr>
Date: Mon, 5 Aug 2019 15:24:45 +0200
Subject: modules: taglib: simplify reading embedded art
(cherry picked from commit 3533f90eb44398abe6cff1b14ece757654449acf) (rebased)
rebased:
- 294cbdbaee0209bc88ca7bec9164da8da4ac44ef has been merged above
---
modules/meta_engine/taglib.cpp | 215 +++++++++++++++++++++--------------------
1 file changed, 110 insertions(+), 105 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 73bc5d8..8770d0c 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -460,6 +460,114 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
}
}
+/**
+ * Fills attachments list from ID3 APIC tags
+ * @param tag: the APIC tags list
+ * @param p_demux_meta: the demuxer meta
+ * @param p_meta: the meta
+ */
+static void ProcessAPICListFromId3v2( const ID3v2::FrameList &list,
+ demux_meta_t* p_demux_meta, vlc_meta_t* p_meta )
+{
+ /* Preferred type of image
+ * The 21 types are defined in id3v2 standard:
+ * http://www.id3.org/id3v2.4.0-frames */
+ static const uint8_t scores[] = {
+ 0, /* Other */
+ 5, /* 32x32 PNG image that should be used as the file icon */
+ 4, /* File icon of a different size or format. */
+ 20, /* Front cover image of the album. */
+ 19, /* Back cover image of the album. */
+ 13, /* Inside leaflet page of the album. */
+ 18, /* Image from the album itself. */
+ 17, /* Picture of the lead artist or soloist. */
+ 16, /* Picture of the artist or performer. */
+ 14, /* Picture of the conductor. */
+ 15, /* Picture of the band or orchestra. */
+ 9, /* Picture of the composer. */
+ 8, /* Picture of the lyricist or text writer. */
+ 7, /* Picture of the recording location or studio. */
+ 10, /* Picture of the artists during recording. */
+ 11, /* Picture of the artists during performance. */
+ 6, /* Picture from a movie or video related to the track. */
+ 1, /* Picture of a large, coloured fish. */
+ 12, /* Illustration related to the track. */
+ 3, /* Logo of the band or performer. */
+ 2 /* Logo of the publisher (record company). */
+ };
+
+ const ID3v2::AttachedPictureFrame *defaultPic = nullptr;
+ for( auto iter = list.begin(); iter != list.end(); ++iter )
+ {
+ const ID3v2::AttachedPictureFrame* p =
+ dynamic_cast<const ID3v2::AttachedPictureFrame*>(*iter);
+ if( !p )
+ continue;
+ if(defaultPic == nullptr)
+ {
+ defaultPic = p;
+ }
+ else
+ {
+ int scorea = defaultPic->type() >= ARRAY_SIZE(scores) ? 0 : scores[defaultPic->type()];
+ int scoreb = p->type() >= ARRAY_SIZE(scores) ? 0 : scores[p->type()];
+ if(scoreb > scorea)
+ defaultPic = p;
+ }
+ }
+
+ for( auto iter = list.begin(); iter != list.end(); ++iter )
+ {
+ const ID3v2::AttachedPictureFrame* p =
+ dynamic_cast<const ID3v2::AttachedPictureFrame*>(*iter);
+ if( !p )
+ continue;
+ // Get the mime and description of the image.
+ String description = p->description();
+ String mimeType = p->mimeType();
+
+ /* some old iTunes version not only sets incorrectly the mime type
+ * or the description of the image,
+ * but also embeds incorrectly the image.
+ * Recent versions seem to behave correctly */
+ if( mimeType == "PNG" || description == "\xC2\x89PNG" )
+ {
+ msg_Warn( p_demux_meta, "Invalid picture embedded by broken iTunes version" );
+ continue;
+ }
+
+ char *psz_name;
+ if( asprintf( &psz_name, "%i", p_demux_meta->i_attachments ) == -1 )
+ continue;
+
+ input_attachment_t *p_attachment =
+ vlc_input_attachment_New( psz_name,
+ mimeType.toCString(),
+ description.toCString(),
+ p->picture().data(),
+ p->picture().size() );
+ free( psz_name );
+ if( !p_attachment )
+ continue;
+
+ msg_Dbg( p_demux_meta, "Found embedded art: %s (%zu bytes)",
+ p_attachment->psz_mime, p_attachment->i_data );
+
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
+
+ if( p == defaultPic )
+ {
+ 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 );
+ }
+ }
+}
static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
{
@@ -579,115 +687,12 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
vlc_meta_DiscNumber, vlc_meta_DiscTotal );
}
- /* Preferred type of image
- * The 21 types are defined in id3v2 standard:
- * http://www.id3.org/id3v2.4.0-frames */
- static const int pi_cover_score[] = {
- 0, /* Other */
- 5, /* 32x32 PNG image that should be used as the file icon */
- 4, /* File icon of a different size or format. */
- 20, /* Front cover image of the album. */
- 19, /* Back cover image of the album. */
- 13, /* Inside leaflet page of the album. */
- 18, /* Image from the album itself. */
- 17, /* Picture of the lead artist or soloist. */
- 16, /* Picture of the artist or performer. */
- 14, /* Picture of the conductor. */
- 15, /* Picture of the band or orchestra. */
- 9, /* Picture of the composer. */
- 8, /* Picture of the lyricist or text writer. */
- 7, /* Picture of the recording location or studio. */
- 10, /* Picture of the artists during recording. */
- 11, /* Picture of the artists during performance. */
- 6, /* Picture from a movie or video related to the track. */
- 1, /* Picture of a large, coloured fish. */
- 12, /* Illustration related to the track. */
- 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
list = tag->frameListMap()[ "APIC" ];
- if( list.isEmpty() )
- return;
-
- for( iter = list.begin(); iter != list.end(); iter++ )
- {
- ID3v2::AttachedPictureFrame* p_apic =
- dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
- if( !p_apic )
- continue;
- input_attachment_t *p_attachment;
-
- const char *psz_mime;
- char *psz_name, *psz_description;
-
- // Get the mime and description of the image.
- // If the description is empty, take the type as a description
- psz_mime = p_apic->mimeType().toCString( true );
- if( p_apic->description().size() > 0 )
- psz_description = strdup( p_apic->description().toCString( true ) );
- else
- {
- if( asprintf( &psz_description, "%i", p_apic->type() ) == -1 )
- psz_description = NULL;
- }
-
- if( !psz_description )
- continue;
- psz_name = psz_description;
-
- /* some old iTunes version not only sets incorrectly the mime type
- * or the description of the image,
- * but also embeds incorrectly the image.
- * Recent versions seem to behave correctly */
- if( !strncmp( psz_mime, "PNG", 3 ) ||
- !strncmp( psz_name, "\xC2\x89PNG", 5 ) )
- {
- msg_Warn( p_demux_meta, "Invalid picture embedded by broken iTunes version" );
- free( psz_description );
- continue;
- }
-
- const ByteVector picture = p_apic->picture();
- const char *p_data = picture.data();
- const unsigned i_data = picture.size();
-
- 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,
- psz_description, p_data, i_data );
- 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();
- 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[i_pic_type];
- 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( !list.isEmpty() )
+ ProcessAPICListFromId3v2( list, p_demux_meta, p_meta );
}
-
/**
* Read the meta information from XiphComments
* @param tag: the Xiph Comment
|
