virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

id3v2: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato 2013-05-01 19:11:54 +02:00 committed by Diego Biurrun
parent a650c906cb
commit 0671adbb18
1 changed files with 147 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
libavformat/id3v2.c
View File

@ -19,13 +19,13 @@
* 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" },
@ -67,7 +67,6 @@ static const AVMetadataConv id3v2_2_metadata_conv[] = {
{ 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",
@ -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);
@ -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
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,7 +299,8 @@ 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;
@ -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 *
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,7 +352,8 @@ 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;
@ -373,7 +377,8 @@ 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;
} }
@ -408,7 +413,8 @@ static void merge_date(AVDictionary **m)
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);
@ -425,7 +431,8 @@ 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];
@ -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
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;
} }
@ -498,7 +508,8 @@ 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;
@ -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";
@ -595,7 +607,9 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
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,
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,
} }
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,7 +651,8 @@ 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 {
@ -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,18 +675,21 @@ 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];