X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fid3v2.c;h=7cedf6e698bfbed00e257c7dab259e5780d0b40f;hb=83120e3bd71457bdbe02785ac0adc74d7c34b219;hp=89c0e63adf66e30ba920a6d0e3efba2558cc71c2;hpb=037e9afd37e11bec8ac3bef5f0688c18edf022f5;p=ffmpeg diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 89c0e63adf6..7cedf6e698b 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -22,12 +22,14 @@ #include "id3v2.h" #include "id3v1.h" #include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" +#include "metadata.h" -int ff_id3v2_match(const uint8_t *buf) +int ff_id3v2_match(const uint8_t *buf, const char * magic) { - return buf[0] == 'I' && - buf[1] == 'D' && - buf[2] == '3' && + return buf[0] == magic[0] && + buf[1] == magic[1] && + buf[2] == magic[2] && buf[3] != 0xff && buf[4] != 0xff && (buf[6] & 0x80) == 0 && @@ -48,26 +50,6 @@ int ff_id3v2_tag_len(const uint8_t * buf) return len; } -void ff_id3v2_read(AVFormatContext *s) -{ - int len, ret; - uint8_t buf[ID3v2_HEADER_SIZE]; - - ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE); - if (ret != ID3v2_HEADER_SIZE) - return; - if (ff_id3v2_match(buf)) { - /* parse ID3v2 header */ - len = ((buf[6] & 0x7f) << 21) | - ((buf[7] & 0x7f) << 14) | - ((buf[8] & 0x7f) << 7) | - (buf[9] & 0x7f); - ff_id3v2_parse(s, len, buf[3], buf[5]); - } else { - url_fseek(s->pb, 0, SEEK_SET); - } -} - static unsigned int get_size(ByteIOContext *s, int len) { int v = 0; @@ -76,7 +58,7 @@ static unsigned int get_size(ByteIOContext *s, int len) return v; } -static void read_ttag(AVFormatContext *s, int taglen, const char *key) +static void read_ttag(AVFormatContext *s, ByteIOContext *pb, int taglen, const char *key) { char *q, dst[512]; const char *val = NULL; @@ -90,20 +72,20 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key) taglen--; /* account for encoding type byte */ - switch (get_byte(s->pb)) { /* encoding type */ + switch (get_byte(pb)) { /* encoding type */ - case 0: /* ISO-8859-1 (0 - 255 maps directly into unicode) */ + case ID3v2_ENCODING_ISO8859: q = dst; while (taglen-- && q - dst < dstlen - 7) { uint8_t tmp; - PUT_UTF8(get_byte(s->pb), tmp, *q++ = tmp;) + PUT_UTF8(get_byte(pb), tmp, *q++ = tmp;) } *q = 0; break; - case 1: /* UTF-16 with BOM */ + case ID3v2_ENCODING_UTF16BOM: taglen -= 2; - switch (get_be16(s->pb)) { + switch (get_be16(pb)) { case 0xfffe: get = get_le16; case 0xfeff: @@ -114,21 +96,21 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key) } // fall-through - case 2: /* UTF-16BE without BOM */ + case ID3v2_ENCODING_UTF16BE: q = dst; while (taglen > 1 && q - dst < dstlen - 7) { uint32_t ch; uint8_t tmp; - GET_UTF16(ch, ((taglen -= 2) >= 0 ? get(s->pb) : 0), break;) + GET_UTF16(ch, ((taglen -= 2) >= 0 ? get(pb) : 0), break;) PUT_UTF8(ch, tmp, *q++ = tmp;) } *q = 0; break; - case 3: /* UTF-8 */ + case ID3v2_ENCODING_UTF8: len = FFMIN(taglen, dstlen); - get_buffer(s->pb, dst, len); + get_buffer(pb, dst, len); dst[len] = 0; break; default: @@ -150,16 +132,19 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key) val = dst; if (val) - av_metadata_set(&s->metadata, key, val); + av_metadata_set2(&s->metadata, key, val, AV_METADATA_DONT_OVERWRITE); } -void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) +static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) { - int isv34, tlen; + int isv34, tlen, unsync; char tag[5]; int64_t next; int taghdrlen; const char *reason; + ByteIOContext pb; + unsigned char *buffer = NULL; + int buffer_size = 0; switch (version) { case 2: @@ -182,15 +167,15 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) goto error; } - if (flags & 0x80) { - reason = "unsynchronization"; - goto error; - } + unsync = flags & 0x80; if (isv34 && flags & 0x40) /* Extended header present, just skip over it */ url_fskip(s->pb, get_size(s->pb, 4)); while (len >= taghdrlen) { + unsigned int tflags; + int tunsync = 0; + if (isv34) { get_buffer(s->pb, tag, 4); tag[4] = 0; @@ -198,7 +183,8 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) tlen = get_be32(s->pb); }else tlen = get_size(s->pb, 4); - get_be16(s->pb); /* flags */ + tflags = get_be16(s->pb); + tunsync = tflags & ID3v2_FLAG_UNSYNCH; } else { get_buffer(s->pb, tag, 3); tag[3] = 0; @@ -211,63 +197,143 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) next = url_ftell(s->pb) + tlen; - if (tag[0] == 'T') - read_ttag(s, tlen, tag); + if (tflags & ID3v2_FLAG_DATALEN) { + get_be32(s->pb); + tlen -= 4; + } + + if (tflags & (ID3v2_FLAG_ENCRYPTION | ID3v2_FLAG_COMPRESSION)) { + av_log(s, AV_LOG_WARNING, "Skipping encrypted/compressed ID3v2 frame %s.\n", tag); + url_fskip(s->pb, tlen); + } else if (tag[0] == 'T') { + if (unsync || tunsync) { + int i, j; + av_fast_malloc(&buffer, &buffer_size, tlen); + for (i = 0, j = 0; i < tlen; i++, j++) { + buffer[j] = get_byte(s->pb); + if (j > 0 && !buffer[j] && buffer[j - 1] == 0xff) { + /* Unsynchronised byte, skip it */ + j--; + } + } + init_put_byte(&pb, buffer, j, 0, NULL, NULL, NULL, NULL); + read_ttag(s, &pb, j, tag); + } else { + read_ttag(s, s->pb, tlen, tag); + } + } else if (!tag[0]) { if (tag[1]) av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding"); - url_fskip(s->pb, len); + url_fskip(s->pb, tlen); break; } /* Skip to end of tag */ url_fseek(s->pb, next, SEEK_SET); } + if (len > 0) { + /* Skip padding */ + url_fskip(s->pb, len); + } if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ url_fskip(s->pb, 10); + + av_free(buffer); return; error: av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); url_fskip(s->pb, len); + av_free(buffer); } -const AVMetadataConv ff_id3v2_metadata_conv[] = { +void ff_id3v2_read(AVFormatContext *s, const char *magic) +{ + int len, ret; + uint8_t buf[ID3v2_HEADER_SIZE]; + int found_header; + int64_t off; + + do { + /* save the current offset in case there's nothing to read/skip */ + off = url_ftell(s->pb); + ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE); + if (ret != ID3v2_HEADER_SIZE) + break; + found_header = ff_id3v2_match(buf, magic); + if (found_header) { + /* parse ID3v2 header */ + len = ((buf[6] & 0x7f) << 21) | + ((buf[7] & 0x7f) << 14) | + ((buf[8] & 0x7f) << 7) | + (buf[9] & 0x7f); + ff_id3v2_parse(s, len, buf[3], buf[5]); + } else { + url_fseek(s->pb, off, SEEK_SET); + } + } while (found_header); + ff_metadata_conv(&s->metadata, NULL, ff_id3v2_34_metadata_conv); + ff_metadata_conv(&s->metadata, NULL, ff_id3v2_2_metadata_conv); + ff_metadata_conv(&s->metadata, NULL, ff_id3v2_4_metadata_conv); +} + +const AVMetadataConv ff_id3v2_34_metadata_conv[] = { { "TALB", "album"}, - { "TAL", "album"}, { "TCOM", "composer"}, { "TCON", "genre"}, - { "TCO", "genre"}, { "TCOP", "copyright"}, - { "TDRL", "date"}, - { "TDRC", "date"}, { "TENC", "encoded_by"}, - { "TEN", "encoded_by"}, { "TIT2", "title"}, - { "TT2", "title"}, { "TLAN", "language"}, { "TPE1", "artist"}, - { "TP1", "artist"}, { "TPE2", "album_artist"}, - { "TP2", "album_artist"}, { "TPE3", "performer"}, - { "TP3", "performer"}, { "TPOS", "disc"}, { "TPUB", "publisher"}, { "TRCK", "track"}, - { "TRK", "track"}, + { "TSSE", "encoder"}, + { 0 } +}; + +const AVMetadataConv ff_id3v2_4_metadata_conv[] = { + { "TDRL", "date"}, + { "TDRC", "date"}, + { "TDEN", "creation_time"}, { "TSOA", "album-sort"}, { "TSOP", "artist-sort"}, { "TSOT", "title-sort"}, - { "TSSE", "encoder"}, { 0 } }; +const AVMetadataConv ff_id3v2_2_metadata_conv[] = { + { "TAL", "album"}, + { "TCO", "genre"}, + { "TT2", "title"}, + { "TEN", "encoded_by"}, + { "TP1", "artist"}, + { "TP2", "album_artist"}, + { "TP3", "performer"}, + { "TRK", "track"}, + { 0 } +}; + + const char ff_id3v2_tags[][4] = { - "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDEN", "TDLY", "TDOR", "TDRC", - "TDRL", "TDTG", "TENC", "TEXT", "TFLT", "TIPL", "TIT1", "TIT2", "TIT3", - "TKEY", "TLAN", "TLEN", "TMCL", "TMED", "TMOO", "TOAL", "TOFN", "TOLY", - "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPRO", "TPUB", - "TRCK", "TRSN", "TRSO", "TSOA", "TSOP", "TSOT", "TSRC", "TSSE", "TSST", + "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", + "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", + "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", + "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", + { 0 }, +}; + +const char ff_id3v2_4_tags[][4] = { + "TDEN", "TDOR", "TDRC", "TDRL", "TDTG", "TIPL", "TMCL", "TMOO", + "TPRO", "TSOA", "TSOP", "TSOT", "TSST", + { 0 }, +}; + +const char ff_id3v2_3_tags[][4] = { + "TDAT", "TIME", "TORY", "TRDA", "TSIZ", "TYER", { 0 }, };