diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-12-23 23:41:37 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-12-23 23:41:37 +0100 |
| commit | 05c3c568dccd6c42fdf6eea891d08c71fe2ee772 (patch) | |
| tree | 0b20ecff6649ebc757b292adafa130aa3334dc3a | |
| parent | 95953c1cfd51cb162190280c1c543e3314da3d63 (diff) | |
| download | ffmpeg-05c3c568dccd6c42fdf6eea891d08c71fe2ee772.tar.gz | |
Read pictures in id3v2.2
| -rw-r--r-- | libavformat/id3v2.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 6c82632ba0..3eb368e918 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -313,7 +313,7 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen, * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct. */ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, - char *tag, ID3v2ExtraMeta **extra_meta) + char *tag, ID3v2ExtraMeta **extra_meta, int isv34) { ID3v2ExtraMetaGEOB *geob_data = NULL; ID3v2ExtraMeta *new_extra = NULL; @@ -445,7 +445,7 @@ static void free_apic(void *obj) } static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, - char *tag, ID3v2ExtraMeta **extra_meta) + char *tag, ID3v2ExtraMeta **extra_meta, int isv34) { int enc, pic_type; char mimetype[64]; @@ -467,7 +467,12 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, taglen--; /* mimetype */ + if (isv34) { taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); + } else { + avio_read(pb, mimetype, 3); + mimetype[3] = 0; + } while (mime->id != AV_CODEC_ID_NONE) { if (!av_strncasecmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; @@ -518,7 +523,7 @@ fail: avio_seek(pb, end, SEEK_SET); } -static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *ttag, ID3v2ExtraMeta **extra_meta) +static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *ttag, ID3v2ExtraMeta **extra_meta, int isv34) { AVRational time_base = {1, 1000}; uint32_t start, end; @@ -569,7 +574,7 @@ typedef struct ID3v2EMFunc { const char *tag3; const char *tag4; void (*read)(AVFormatContext *, AVIOContext *, int, char *, - ID3v2ExtraMeta **); + ID3v2ExtraMeta **, int isv34); void (*free)(void *obj); } ID3v2EMFunc; @@ -790,7 +795,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, read_ttag(s, pbx, tlen, &s->metadata, tag); else /* parse special meta tag */ - extra_func->read(s, pbx, tlen, tag, extra_meta); + extra_func->read(s, pbx, tlen, tag, extra_meta, isv34); } else if (!tag[0]) { if (tag[1]) av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding\n"); |