Commit 7d7b8c32 authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Reformat to K&R and prettyprint newly created files.

Originally committed as revision 19156 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 75411182
...@@ -50,9 +50,9 @@ int ff_id3v2_tag_len(const uint8_t * buf) ...@@ -50,9 +50,9 @@ int ff_id3v2_tag_len(const uint8_t * buf)
static unsigned int get_size(ByteIOContext *s, int len) static unsigned int get_size(ByteIOContext *s, int len)
{ {
int v=0; int v = 0;
while(len--) while (len--)
v= (v<<7) + (get_byte(s)&0x7F); v = (v << 7) + (get_byte(s) & 0x7F);
return v; return v;
} }
...@@ -62,17 +62,17 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key) ...@@ -62,17 +62,17 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key)
int len, dstlen = sizeof(dst) - 1; int len, dstlen = sizeof(dst) - 1;
unsigned genre; unsigned genre;
dst[0]= 0; dst[0] = 0;
if(taglen < 1) if (taglen < 1)
return; return;
taglen--; /* account for encoding type byte */ taglen--; /* account for encoding type byte */
switch(get_byte(s->pb)) { /* encoding type */ switch (get_byte(s->pb)) { /* encoding type */
case 0: /* ISO-8859-1 (0 - 255 maps directly into unicode) */ case 0: /* ISO-8859-1 (0 - 255 maps directly into unicode) */
q = dst; q = dst;
while(taglen--) { while (taglen--) {
uint8_t tmp; uint8_t tmp;
PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;) PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;)
} }
...@@ -80,7 +80,7 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key) ...@@ -80,7 +80,7 @@ static void read_ttag(AVFormatContext *s, int taglen, const char *key)
break; break;
case 3: /* UTF-8 */ case 3: /* UTF-8 */
len = FFMIN(taglen, dstlen-1); len = FFMIN(taglen, dstlen - 1);
get_buffer(s->pb, dst, len); get_buffer(s->pb, dst, len);
dst[len] = 0; dst[len] = 0;
break; break;
...@@ -103,9 +103,9 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -103,9 +103,9 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
int taghdrlen; int taghdrlen;
const char *reason; const char *reason;
switch(version) { switch (version) {
case 2: case 2:
if(flags & 0x40) { if (flags & 0x40) {
reason = "compression"; reason = "compression";
goto error; goto error;
} }
...@@ -124,16 +124,16 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -124,16 +124,16 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
goto error; goto error;
} }
if(flags & 0x80) { if (flags & 0x80) {
reason = "unsynchronization"; reason = "unsynchronization";
goto error; goto error;
} }
if(isv34 && flags & 0x40) /* Extended header present, just skip over it */ if (isv34 && flags & 0x40) /* Extended header present, just skip over it */
url_fskip(s->pb, get_size(s->pb, 4)); url_fskip(s->pb, get_size(s->pb, 4));
while(len >= taghdrlen) { while (len >= taghdrlen) {
if(isv34) { if (isv34) {
tag = get_be32(s->pb); tag = get_be32(s->pb);
tlen = get_size(s->pb, 4); tlen = get_size(s->pb, 4);
get_be16(s->pb); /* flags */ get_be16(s->pb); /* flags */
...@@ -143,12 +143,12 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -143,12 +143,12 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
} }
len -= taghdrlen + tlen; len -= taghdrlen + tlen;
if(len < 0) if (len < 0)
break; break;
next = url_ftell(s->pb) + tlen; next = url_ftell(s->pb) + tlen;
switch(tag) { switch (tag) {
case MKBETAG('T', 'I', 'T', '2'): case MKBETAG('T', 'I', 'T', '2'):
case MKBETAG(0, 'T', 'T', '2'): case MKBETAG(0, 'T', 'T', '2'):
read_ttag(s, tlen, "title"); read_ttag(s, tlen, "title");
...@@ -183,7 +183,7 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -183,7 +183,7 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
url_fseek(s->pb, next, SEEK_SET); url_fseek(s->pb, next, SEEK_SET);
} }
if(version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ if (version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */
url_fskip(s->pb, 10); url_fskip(s->pb, 10);
return; return;
...@@ -191,4 +191,3 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) ...@@ -191,4 +191,3 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
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);
url_fskip(s->pb, len); url_fskip(s->pb, len);
} }
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