Skip to content

F
ffmpeg
Commit 0671adbb authored by Luca Barbato's avatar Luca Barbato Committed by Diego Biurrun
Browse files
Options

id3v2: K&R formatting cosmetics 

Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent a650c906
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 126 deletions
libavformat/id3v2.c
View file @ 0671adbb
...@@ -19,72 +19,71 @@ ...@@ -19,72 +19,71 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "id3v2.h"
#include "id3v1.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/intreadwrite.h"
#include "avio_internal.h" #include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "id3v1.h"
#include "id3v2.h"
const AVMetadataConv ff_id3v2_34_metadata_conv[] = { const AVMetadataConv ff_id3v2_34_metadata_conv[] = {
{ "TALB", "album"}, { "TALB", "album" },
{ "TCOM", "composer"}, { "TCOM", "composer" },
{ "TCON", "genre"}, { "TCON", "genre" },
{ "TCOP", "copyright"}, { "TCOP", "copyright" },
{ "TENC", "encoded_by"}, { "TENC", "encoded_by" },
{ "TIT2", "title"}, { "TIT2", "title" },
{ "TLAN", "language"}, { "TLAN", "language" },
{ "TPE1", "artist"}, { "TPE1", "artist" },
{ "TPE2", "album_artist"}, { "TPE2", "album_artist" },
{ "TPE3", "performer"}, { "TPE3", "performer" },
{ "TPOS", "disc"}, { "TPOS", "disc" },
{ "TPUB", "publisher"}, { "TPUB", "publisher" },
{ "TRCK", "track"}, { "TRCK", "track" },
{ "TSSE", "encoder"}, { "TSSE", "encoder" },
{ 0 } { 0 }
}; };
const AVMetadataConv ff_id3v2_4_metadata_conv[] = { const AVMetadataConv ff_id3v2_4_metadata_conv[] = {
{ "TDRL", "date"}, { "TDRL", "date" },
{ "TDRC", "date"}, { "TDRC", "date" },
{ "TDEN", "creation_time"}, { "TDEN", "creation_time" },
{ "TSOA", "album-sort"}, { "TSOA", "album-sort" },
{ "TSOP", "artist-sort"}, { "TSOP", "artist-sort" },
{ "TSOT", "title-sort"}, { "TSOT", "title-sort" },
{ 0 } { 0 }
}; };
static const AVMetadataConv id3v2_2_metadata_conv[] = { static const AVMetadataConv id3v2_2_metadata_conv[] = {
{ "TAL", "album"}, { "TAL", "album" },
{ "TCO", "genre"}, { "TCO", "genre" },
{ "TT2", "title"}, { "TT2", "title" },
{ "TEN", "encoded_by"}, { "TEN", "encoded_by" },
{ "TP1", "artist"}, { "TP1", "artist" },
{ "TP2", "album_artist"}, { "TP2", "album_artist" },
{ "TP3", "performer"}, { "TP3", "performer" },
{ "TRK", "track"}, { "TRK", "track" },
{ 0 } { 0 }
}; };
const char ff_id3v2_tags[][4] = { const char ff_id3v2_tags[][4] = {
"TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT",
"TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED",
"TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3",
"TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE",
{ 0 }, { 0 },
}; };
const char ff_id3v2_4_tags[][4] = { const char ff_id3v2_4_tags[][4] = {
"TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO", "TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO",
"TPRO", "TSOA", "TSOP", "TSOT", "TSST", "TPRO", "TSOA", "TSOP", "TSOT", "TSST",
{ 0 }, { 0 },
}; };
const char ff_id3v2_3_tags[][4] = { const char ff_id3v2_3_tags[][4] = {
"TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER", "TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER",
{ 0 }, { 0 },
}; };
const char *ff_id3v2_picture_types[21] = { const char *ff_id3v2_picture_types[21] = {
...@@ -112,36 +111,36 @@ const char *ff_id3v2_picture_types[21] = { ...@@ -112,36 +111,36 @@ const char *ff_id3v2_picture_types[21] = {
}; };
const CodecMime ff_id3v2_mime_tags[] = { const CodecMime ff_id3v2_mime_tags[] = {
{"image/gif" , AV_CODEC_ID_GIF}, { "image/gif", AV_CODEC_ID_GIF },
{"image/jpeg", AV_CODEC_ID_MJPEG}, { "image/jpeg", AV_CODEC_ID_MJPEG },
{"image/jpg", AV_CODEC_ID_MJPEG}, { "image/jpg", AV_CODEC_ID_MJPEG },
{"image/png" , AV_CODEC_ID_PNG}, { "image/png", AV_CODEC_ID_PNG },
{"image/tiff", AV_CODEC_ID_TIFF}, { "image/tiff", AV_CODEC_ID_TIFF },
{"image/bmp", AV_CODEC_ID_BMP}, { "image/bmp", AV_CODEC_ID_BMP },
{"JPG", AV_CODEC_ID_MJPEG}, /* ID3v2.2 */ { "JPG", AV_CODEC_ID_MJPEG }, /* ID3v2.2 */
{"PNG" , AV_CODEC_ID_PNG}, /* ID3v2.2 */ { "PNG", AV_CODEC_ID_PNG }, /* ID3v2.2 */
{"", AV_CODEC_ID_NONE}, { "", AV_CODEC_ID_NONE },
}; };
int ff_id3v2_match(const uint8_t *buf, const char * magic) int ff_id3v2_match(const uint8_t *buf, const char *magic)
{ {
return buf[0] == magic[0] && return buf[0] == magic[0] &&
buf[1] == magic[1] && buf[1] == magic[1] &&
buf[2] == magic[2] && buf[2] == magic[2] &&
buf[3] != 0xff && buf[3] != 0xff &&
buf[4] != 0xff && buf[4] != 0xff &&
(buf[6] & 0x80) == 0 && (buf[6] & 0x80) == 0 &&
(buf[7] & 0x80) == 0 && (buf[7] & 0x80) == 0 &&
(buf[8] & 0x80) == 0 && (buf[8] & 0x80) == 0 &&
(buf[9] & 0x80) == 0; (buf[9] & 0x80) == 0;
} }
int ff_id3v2_tag_len(const uint8_t * buf) int ff_id3v2_tag_len(const uint8_t *buf)
{ {
int len = ((buf[6] & 0x7f) << 21) + int len = ((buf[6] & 0x7f) << 21) +
((buf[7] & 0x7f) << 14) + ((buf[7] & 0x7f) << 14) +
((buf[8] & 0x7f) << 7) + ((buf[8] & 0x7f) << 7) +
(buf[9] & 0x7f) + (buf[9] & 0x7f) +
ID3v2_HEADER_SIZE; ID3v2_HEADER_SIZE;
if (buf[5] & 0x10) if (buf[5] & 0x10)
len += ID3v2_HEADER_SIZE; len += ID3v2_HEADER_SIZE;
...@@ -197,7 +196,6 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, ...@@ -197,7 +196,6 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
} }
switch (encoding) { switch (encoding) {
case ID3v2_ENCODING_ISO8859: case ID3v2_ENCODING_ISO8859:
while (left && ch) { while (left && ch) {
ch = avio_r8(pb); ch = avio_r8(pb);
...@@ -233,7 +231,7 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, ...@@ -233,7 +231,7 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
PUT_UTF8(ch, tmp, avio_w8(dynbuf, tmp);) PUT_UTF8(ch, tmp, avio_w8(dynbuf, tmp);)
} }
if (left < 0) if (left < 0)
left += 2; /* did not read last char from pb */ left += 2; /* did not read last char from pb */
break; break;
case ID3v2_ENCODING_UTF8: case ID3v2_ENCODING_UTF8:
...@@ -259,7 +257,8 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, ...@@ -259,7 +257,8 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding,
/** /**
* Parse a text tag. * Parse a text tag.
*/ */
static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const char *key) static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen,
const char *key)
{ {
uint8_t *dst; uint8_t *dst;
int encoding, dict_flags = AV_DICT_DONT_OVERWRITE | AV_DICT_DONT_STRDUP_VAL; int encoding, dict_flags = AV_DICT_DONT_OVERWRITE | AV_DICT_DONT_STRDUP_VAL;
...@@ -276,9 +275,9 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const cha ...@@ -276,9 +275,9 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const cha
return; return;
} }
if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) if (!(strcmp(key, "TCON") && strcmp(key, "TCO")) &&
&& (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) &&
&& genre <= ID3v1_GENRE_MAX) { genre <= ID3v1_GENRE_MAX) {
av_freep(&dst); av_freep(&dst);
dst = av_strdup(ff_id3v1_genre_str[genre]); dst = av_strdup(ff_id3v1_genre_str[genre]);
} else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX"))) { } else if (!(strcmp(key, "TXXX") && strcmp(key, "TXX"))) {
...@@ -300,10 +299,11 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const cha ...@@ -300,10 +299,11 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, const cha
/** /**
* Parse GEOB tag into a ID3v2ExtraMetaGEOB struct. * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct.
*/ */
static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta) static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen,
char *tag, ID3v2ExtraMeta **extra_meta)
{ {
ID3v2ExtraMetaGEOB *geob_data = NULL; ID3v2ExtraMetaGEOB *geob_data = NULL;
ID3v2ExtraMeta *new_extra = NULL; ID3v2ExtraMeta *new_extra = NULL;
char encoding; char encoding;
unsigned int len; unsigned int len;
...@@ -312,13 +312,15 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char * ...@@ -312,13 +312,15 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char *
geob_data = av_mallocz(sizeof(ID3v2ExtraMetaGEOB)); geob_data = av_mallocz(sizeof(ID3v2ExtraMetaGEOB));
if (!geob_data) { if (!geob_data) {
av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n", sizeof(ID3v2ExtraMetaGEOB)); av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n",
sizeof(ID3v2ExtraMetaGEOB));
return; return;
} }
new_extra = av_mallocz(sizeof(ID3v2ExtraMeta)); new_extra = av_mallocz(sizeof(ID3v2ExtraMeta));
if (!new_extra) { if (!new_extra) {
av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n", sizeof(ID3v2ExtraMeta)); av_log(s, AV_LOG_ERROR, "Failed to alloc %zu bytes\n",
sizeof(ID3v2ExtraMeta));
goto fail; goto fail;
} }
...@@ -327,18 +329,19 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char * ...@@ -327,18 +329,19 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char *
taglen--; taglen--;
/* read MIME type (always ISO-8859) */ /* read MIME type (always ISO-8859) */
if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &geob_data->mime_type, &taglen) < 0 if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &geob_data->mime_type,
|| taglen <= 0) &taglen) < 0 ||
taglen <= 0)
goto fail; goto fail;
/* read file name */ /* read file name */
if (decode_str(s, pb, encoding, &geob_data->file_name, &taglen) < 0 if (decode_str(s, pb, encoding, &geob_data->file_name, &taglen) < 0 ||
|| taglen <= 0) taglen <= 0)
goto fail; goto fail;
/* read content description */ /* read content description */
if (decode_str(s, pb, encoding, &geob_data->description, &taglen) < 0 if (decode_str(s, pb, encoding, &geob_data->description, &taglen) < 0 ||
|| taglen < 0) taglen < 0)
goto fail; goto fail;
if (taglen) { if (taglen) {
...@@ -349,18 +352,19 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char * ...@@ -349,18 +352,19 @@ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, char *
goto fail; goto fail;
} }
if ((len = avio_read(pb, geob_data->data, taglen)) < taglen) if ((len = avio_read(pb, geob_data->data, taglen)) < taglen)
av_log(s, AV_LOG_WARNING, "Error reading GEOB frame, data truncated.\n"); av_log(s, AV_LOG_WARNING,
"Error reading GEOB frame, data truncated.\n");
geob_data->datasize = len; geob_data->datasize = len;
} else { } else {
geob_data->data = NULL; geob_data->data = NULL;
geob_data->datasize = 0; geob_data->datasize = 0;
} }
/* add data to the list */ /* add data to the list */
new_extra->tag = "GEOB"; new_extra->tag = "GEOB";
new_extra->data = geob_data; new_extra->data = geob_data;
new_extra->next = *extra_meta; new_extra->next = *extra_meta;
*extra_meta = new_extra; *extra_meta = new_extra;
return; return;
...@@ -373,11 +377,12 @@ fail: ...@@ -373,11 +377,12 @@ fail:
static int is_number(const char *str) static int is_number(const char *str)
{ {
while (*str >= '0' && *str <= '9') str++; while (*str >= '0' && *str <= '9')
str++;
return !*str; return !*str;
} }
static AVDictionaryEntry* get_date_tag(AVDictionary *m, const char *tag) static AVDictionaryEntry *get_date_tag(AVDictionary *m, const char *tag)
{ {
AVDictionaryEntry *t; AVDictionaryEntry *t;
if ((t = av_dict_get(m, tag, NULL, AV_DICT_MATCH_CASE)) && if ((t = av_dict_get(m, tag, NULL, AV_DICT_MATCH_CASE)) &&
...@@ -389,28 +394,29 @@ static AVDictionaryEntry* get_date_tag(AVDictionary *m, const char *tag) ...@@ -389,28 +394,29 @@ static AVDictionaryEntry* get_date_tag(AVDictionary *m, const char *tag)
static void merge_date(AVDictionary **m) static void merge_date(AVDictionary **m)
{ {
AVDictionaryEntry *t; AVDictionaryEntry *t;
char date[17] = {0}; // YYYY-MM-DD hh:mm char date[17] = { 0 }; // YYYY-MM-DD hh:mm
if (!(t = get_date_tag(*m, "TYER")) && if (!(t = get_date_tag(*m, "TYER")) &&
!(t = get_date_tag(*m, "TYE"))) !(t = get_date_tag(*m, "TYE")))
return; return;
av_strlcpy(date, t->value, 5); av_strlcpy(date, t->value, 5);
av_dict_set(m, "TYER", NULL, 0); av_dict_set(m, "TYER", NULL, 0);
av_dict_set(m, "TYE", NULL, 0); av_dict_set(m, "TYE", NULL, 0);
if (!(t = get_date_tag(*m, "TDAT")) && if (!(t = get_date_tag(*m, "TDAT")) &&
!(t = get_date_tag(*m, "TDA"))) !(t = get_date_tag(*m, "TDA")))
goto finish; goto finish;
snprintf(date + 4, sizeof(date) - 4, "-%.2s-%.2s", t->value + 2, t->value); snprintf(date + 4, sizeof(date) - 4, "-%.2s-%.2s", t->value + 2, t->value);
av_dict_set(m, "TDAT", NULL, 0); av_dict_set(m, "TDAT", NULL, 0);
av_dict_set(m, "TDA", NULL, 0); av_dict_set(m, "TDA", NULL, 0);
if (!(t = get_date_tag(*m, "TIME")) && if (!(t = get_date_tag(*m, "TIME")) &&
!(t = get_date_tag(*m, "TIM"))) !(t = get_date_tag(*m, "TIM")))
goto finish; goto finish;
snprintf(date + 10, sizeof(date) - 10, " %.2s:%.2s", t->value, t->value + 2); snprintf(date + 10, sizeof(date) - 10,
" %.2s:%.2s", t->value, t->value + 2);
av_dict_set(m, "TIME", NULL, 0); av_dict_set(m, "TIME", NULL, 0);
av_dict_set(m, "TIM", NULL, 0); av_dict_set(m, "TIM", NULL, 0);
finish: finish:
if (date[0]) if (date[0])
...@@ -425,15 +431,16 @@ static void free_apic(void *obj) ...@@ -425,15 +431,16 @@ static void free_apic(void *obj)
av_freep(&apic); av_freep(&apic);
} }
static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag, ID3v2ExtraMeta **extra_meta) static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen,
char *tag, ID3v2ExtraMeta **extra_meta)
{ {
int enc, pic_type; int enc, pic_type;
char mimetype[64]; char mimetype[64];
const CodecMime *mime = ff_id3v2_mime_tags; const CodecMime *mime = ff_id3v2_mime_tags;
enum AVCodecID id = AV_CODEC_ID_NONE; enum AVCodecID id = AV_CODEC_ID_NONE;
ID3v2ExtraMetaAPIC *apic = NULL; ID3v2ExtraMetaAPIC *apic = NULL;
ID3v2ExtraMeta *new_extra = NULL; ID3v2ExtraMeta *new_extra = NULL;
int64_t end = avio_tell(pb) + taglen; int64_t end = avio_tell(pb) + taglen;
if (taglen <= 4) if (taglen <= 4)
goto fail; goto fail;
...@@ -456,7 +463,8 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag ...@@ -456,7 +463,8 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag
mime++; mime++;
} }
if (id == AV_CODEC_ID_NONE) { if (id == AV_CODEC_ID_NONE) {
av_log(s, AV_LOG_WARNING, "Unknown attached picture mimetype: %s, skipping.\n", mimetype); av_log(s, AV_LOG_WARNING,
"Unknown attached picture mimetype: %s, skipping.\n", mimetype);
goto fail; goto fail;
} }
apic->id = id; apic->id = id;
...@@ -465,14 +473,16 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag ...@@ -465,14 +473,16 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag
pic_type = avio_r8(pb); pic_type = avio_r8(pb);
taglen--; taglen--;
if (pic_type < 0 || pic_type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types)) { if (pic_type < 0 || pic_type >= FF_ARRAY_ELEMS(ff_id3v2_picture_types)) {
av_log(s, AV_LOG_WARNING, "Unknown attached picture type %d.\n", pic_type); av_log(s, AV_LOG_WARNING, "Unknown attached picture type %d.\n",
pic_type);
pic_type = 0; pic_type = 0;
} }
apic->type = ff_id3v2_picture_types[pic_type]; apic->type = ff_id3v2_picture_types[pic_type];
/* description and picture data */ /* description and picture data */
if (decode_str(s, pb, enc, &apic->description, &taglen) < 0) { if (decode_str(s, pb, enc, &apic->description, &taglen) < 0) {
av_log(s, AV_LOG_ERROR, "Error decoding attached picture description.\n"); av_log(s, AV_LOG_ERROR,
"Error decoding attached picture description.\n");
goto fail; goto fail;
} }
...@@ -481,10 +491,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag ...@@ -481,10 +491,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, char *tag
goto fail; goto fail;
memset(apic->buf->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(apic->buf->data + taglen, 0, FF_INPUT_BUFFER_PADDING_SIZE);
new_extra->tag = "APIC"; new_extra->tag = "APIC";
new_extra->data = apic; new_extra->data = apic;
new_extra->next = *extra_meta; new_extra->next = *extra_meta;
*extra_meta = new_extra; *extra_meta = new_extra;
return; return;
...@@ -498,13 +508,14 @@ fail: ...@@ -498,13 +508,14 @@ fail:
typedef struct ID3v2EMFunc { typedef struct ID3v2EMFunc {
const char *tag3; const char *tag3;
const char *tag4; const char *tag4;
void (*read)(AVFormatContext*, AVIOContext*, int, char*, ID3v2ExtraMeta **); void (*read)(AVFormatContext *, AVIOContext *, int, char *,
ID3v2ExtraMeta **);
void (*free)(void *obj); void (*free)(void *obj);
} ID3v2EMFunc; } ID3v2EMFunc;
static const ID3v2EMFunc id3v2_extra_meta_funcs[] = { static const ID3v2EMFunc id3v2_extra_meta_funcs[] = {
{ "GEO", "GEOB", read_geobtag, free_geobtag }, { "GEO", "GEOB", read_geobtag, free_geobtag },
{ "PIC", "APIC", read_apic, free_apic }, { "PIC", "APIC", read_apic, free_apic },
{ NULL } { NULL }
}; };
...@@ -538,7 +549,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -538,7 +549,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
AVIOContext pb; AVIOContext pb;
AVIOContext *pbx; AVIOContext *pbx;
unsigned char *buffer = NULL; unsigned char *buffer = NULL;
int buffer_size = 0; int buffer_size = 0;
const ID3v2EMFunc *extra_func; const ID3v2EMFunc *extra_func;
switch (version) { switch (version) {
...@@ -547,13 +558,13 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -547,13 +558,13 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
reason = "compression"; reason = "compression";
goto error; goto error;
} }
isv34 = 0; isv34 = 0;
taghdrlen = 6; taghdrlen = 6;
break; break;
case 3: case 3:
case 4: case 4:
isv34 = 1; isv34 = 1;
taghdrlen = 10; taghdrlen = 10;
break; break;
...@@ -567,7 +578,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -567,7 +578,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */ if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */
int extlen = get_size(s->pb, 4); int extlen = get_size(s->pb, 4);
if (version == 4) if (version == 4)
extlen -= 4; // in v2.4 the length includes the length field we just read /* In v2.4 the length includes the length field we just read. */
extlen -= 4;
if (extlen < 0) { if (extlen < 0) {
reason = "invalid extended header length"; reason = "invalid extended header length";
...@@ -578,24 +590,26 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -578,24 +590,26 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
while (len >= taghdrlen) { while (len >= taghdrlen) {
unsigned int tflags = 0; unsigned int tflags = 0;
int tunsync = 0; int tunsync = 0;
if (isv34) { if (isv34) {
avio_read(s->pb, tag, 4); avio_read(s->pb, tag, 4);
tag[4] = 0; tag[4] = 0;
if(version==3){ if (version == 3) {
tlen = avio_rb32(s->pb); tlen = avio_rb32(s->pb);
}else } else
tlen = get_size(s->pb, 4); tlen = get_size(s->pb, 4);
tflags = avio_rb16(s->pb); tflags = avio_rb16(s->pb);
tunsync = tflags & ID3v2_FLAG_UNSYNCH; tunsync = tflags & ID3v2_FLAG_UNSYNCH;
} else { } else {
avio_read(s->pb, tag, 3); avio_read(s->pb, tag, 3);
tag[3] = 0; tag[3] = 0;
tlen = avio_rb24(s->pb); tlen = avio_rb24(s->pb);
} }
if (tlen < 0 || tlen > len - taghdrlen) { if (tlen < 0 || tlen > len - taghdrlen) {
av_log(s, AV_LOG_WARNING, "Invalid size in frame %s, skipping the rest of tag.\n", tag); av_log(s, AV_LOG_WARNING,
"Invalid size in frame %s, skipping the rest of tag.\n",
tag);
break; break;
} }
len -= taghdrlen + tlen; len -= taghdrlen + tlen;
...@@ -603,7 +617,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -603,7 +617,8 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
if (!tlen) { if (!tlen) {
if (tag[0]) if (tag[0])
av_log(s, AV_LOG_DEBUG, "Invalid empty frame %s, skipping.\n", tag); av_log(s, AV_LOG_DEBUG, "Invalid empty frame %s, skipping.\n",
tag);
continue; continue;
} }
...@@ -613,10 +628,13 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -613,10 +628,13 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
} }
if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) { if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) {
av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag); av_log(s, AV_LOG_WARNING,
"Skipping encrypted/compressed ID3v2 frame %s.\n", tag);
avio_skip(s->pb, tlen); avio_skip(s->pb, tlen);
/* check for text tag or supported special meta tag */ /* check for text tag or supported special meta tag */
} else if (tag[0] == 'T' || (extra_meta && (extra_func = get_extra_meta_func(tag, isv34)))) { } else if (tag[0] == 'T' ||
(extra_meta &&
(extra_func = get_extra_meta_func(tag, isv34)))) {
if (unsync || tunsync) { if (unsync || tunsync) {
int64_t end = avio_tell(s->pb) + tlen; int64_t end = avio_tell(s->pb) + tlen;
uint8_t *b; uint8_t *b;
...@@ -633,9 +651,10 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -633,9 +651,10 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
*b++ = val ? val : avio_r8(s->pb); *b++ = val ? val : avio_r8(s->pb);
} }
} }
ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL, NULL); ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL,
NULL);
tlen = b - buffer; tlen = b - buffer;
pbx = &pb; // read from sync buffer pbx = &pb; // read from sync buffer
} else { } else {
pbx = s->pb; // read straight from input pbx = s->pb; // read straight from input
} }
...@@ -645,8 +664,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, ...@@ -645,8 +664,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
else else
/* parse special meta tag */ /* parse special meta tag */
extra_func->read(s, pbx, tlen, tag, extra_meta); extra_func->read(s, pbx, tlen, tag, extra_meta);
} } else if (!tag[0]) {
else if (!tag[0]) {
if (tag[1]) if (tag[1])
av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding"); av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
avio_skip(s->pb, tlen); avio_skip(s->pb, tlen);
...@@ -657,22 +675,25 @@ seek: ...@@ -657,22 +675,25 @@ seek:
avio_seek(s->pb, next, SEEK_SET); avio_seek(s->pb, next, SEEK_SET);
} }
if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ /* Footer preset, always 10 bytes, skip over it */
if (version == 4 && flags & 0x10)
end += 10; end += 10;
error: error:
if (reason) if (reason)
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n",
version, reason);
avio_seek(s->pb, end, SEEK_SET); avio_seek(s->pb, end, SEEK_SET);
av_free(buffer); av_free(buffer);
return; return;
} }
void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta **extra_meta) void ff_id3v2_read(AVFormatContext *s, const char *magic,
ID3v2ExtraMeta **extra_meta)
{ {
int len, ret; int len, ret;
uint8_t buf[ID3v2_HEADER_SIZE]; uint8_t buf[ID3v2_HEADER_SIZE];
int found_header; int found_header;
int64_t off; int64_t off;
do { do {
...@@ -681,8 +702,8 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta **extra ...@@ -681,8 +702,8 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta **extra
ret = avio_read(s->pb, buf, ID3v2_HEADER_SIZE); ret = avio_read(s->pb, buf, ID3v2_HEADER_SIZE);
if (ret != ID3v2_HEADER_SIZE) if (ret != ID3v2_HEADER_SIZE)
break; break;
found_header = ff_id3v2_match(buf, magic); found_header = ff_id3v2_match(buf, magic);
if (found_header) { if (found_header) {
/* parse ID3v2 header */ /* parse ID3v2 header */
len = ((buf[6] & 0x7f) << 21) | len = ((buf[6] & 0x7f) << 21) |
((buf[7] & 0x7f) << 14) | ((buf[7] & 0x7f) << 14) |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment