[FFmpeg-cvslog] r19156 - in trunk/libavformat: id3v1.c id3v2.c
diego
subversion
Thu Jun 11 17:35:23 CEST 2009
Author: diego
Date: Thu Jun 11 17:35:23 2009
New Revision: 19156
Log:
cosmetics: Reformat to K&R and prettyprint newly created files.
Modified:
trunk/libavformat/id3v1.c
trunk/libavformat/id3v2.c
Modified: trunk/libavformat/id3v1.c
==============================================================================
--- trunk/libavformat/id3v1.c Thu Jun 11 17:26:57 2009 (r19155)
+++ trunk/libavformat/id3v1.c Thu Jun 11 17:35:23 2009 (r19156)
@@ -22,106 +22,106 @@
#include "id3v1.h"
const char *ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
- [0] = "Blues",
- [1] = "Classic Rock",
- [2] = "Country",
- [3] = "Dance",
- [4] = "Disco",
- [5] = "Funk",
- [6] = "Grunge",
- [7] = "Hip-Hop",
- [8] = "Jazz",
- [9] = "Metal",
- [10] = "New Age",
- [11] = "Oldies",
- [12] = "Other",
- [13] = "Pop",
- [14] = "R&B",
- [15] = "Rap",
- [16] = "Reggae",
- [17] = "Rock",
- [18] = "Techno",
- [19] = "Industrial",
- [20] = "Alternative",
- [21] = "Ska",
- [22] = "Death Metal",
- [23] = "Pranks",
- [24] = "Soundtrack",
- [25] = "Euro-Techno",
- [26] = "Ambient",
- [27] = "Trip-Hop",
- [28] = "Vocal",
- [29] = "Jazz+Funk",
- [30] = "Fusion",
- [31] = "Trance",
- [32] = "Classical",
- [33] = "Instrumental",
- [34] = "Acid",
- [35] = "House",
- [36] = "Game",
- [37] = "Sound Clip",
- [38] = "Gospel",
- [39] = "Noise",
- [40] = "AlternRock",
- [41] = "Bass",
- [42] = "Soul",
- [43] = "Punk",
- [44] = "Space",
- [45] = "Meditative",
- [46] = "Instrumental Pop",
- [47] = "Instrumental Rock",
- [48] = "Ethnic",
- [49] = "Gothic",
- [50] = "Darkwave",
- [51] = "Techno-Industrial",
- [52] = "Electronic",
- [53] = "Pop-Folk",
- [54] = "Eurodance",
- [55] = "Dream",
- [56] = "Southern Rock",
- [57] = "Comedy",
- [58] = "Cult",
- [59] = "Gangsta",
- [60] = "Top 40",
- [61] = "Christian Rap",
- [62] = "Pop/Funk",
- [63] = "Jungle",
- [64] = "Native American",
- [65] = "Cabaret",
- [66] = "New Wave",
- [67] = "Psychadelic",
- [68] = "Rave",
- [69] = "Showtunes",
- [70] = "Trailer",
- [71] = "Lo-Fi",
- [72] = "Tribal",
- [73] = "Acid Punk",
- [74] = "Acid Jazz",
- [75] = "Polka",
- [76] = "Retro",
- [77] = "Musical",
- [78] = "Rock & Roll",
- [79] = "Hard Rock",
- [80] = "Folk",
- [81] = "Folk-Rock",
- [82] = "National Folk",
- [83] = "Swing",
- [84] = "Fast Fusion",
- [85] = "Bebob",
- [86] = "Latin",
- [87] = "Revival",
- [88] = "Celtic",
- [89] = "Bluegrass",
- [90] = "Avantgarde",
- [91] = "Gothic Rock",
- [92] = "Progressive Rock",
- [93] = "Psychedelic Rock",
- [94] = "Symphonic Rock",
- [95] = "Slow Rock",
- [96] = "Big Band",
- [97] = "Chorus",
- [98] = "Easy Listening",
- [99] = "Acoustic",
+ [0] = "Blues",
+ [1] = "Classic Rock",
+ [2] = "Country",
+ [3] = "Dance",
+ [4] = "Disco",
+ [5] = "Funk",
+ [6] = "Grunge",
+ [7] = "Hip-Hop",
+ [8] = "Jazz",
+ [9] = "Metal",
+ [10] = "New Age",
+ [11] = "Oldies",
+ [12] = "Other",
+ [13] = "Pop",
+ [14] = "R&B",
+ [15] = "Rap",
+ [16] = "Reggae",
+ [17] = "Rock",
+ [18] = "Techno",
+ [19] = "Industrial",
+ [20] = "Alternative",
+ [21] = "Ska",
+ [22] = "Death Metal",
+ [23] = "Pranks",
+ [24] = "Soundtrack",
+ [25] = "Euro-Techno",
+ [26] = "Ambient",
+ [27] = "Trip-Hop",
+ [28] = "Vocal",
+ [29] = "Jazz+Funk",
+ [30] = "Fusion",
+ [31] = "Trance",
+ [32] = "Classical",
+ [33] = "Instrumental",
+ [34] = "Acid",
+ [35] = "House",
+ [36] = "Game",
+ [37] = "Sound Clip",
+ [38] = "Gospel",
+ [39] = "Noise",
+ [40] = "AlternRock",
+ [41] = "Bass",
+ [42] = "Soul",
+ [43] = "Punk",
+ [44] = "Space",
+ [45] = "Meditative",
+ [46] = "Instrumental Pop",
+ [47] = "Instrumental Rock",
+ [48] = "Ethnic",
+ [49] = "Gothic",
+ [50] = "Darkwave",
+ [51] = "Techno-Industrial",
+ [52] = "Electronic",
+ [53] = "Pop-Folk",
+ [54] = "Eurodance",
+ [55] = "Dream",
+ [56] = "Southern Rock",
+ [57] = "Comedy",
+ [58] = "Cult",
+ [59] = "Gangsta",
+ [60] = "Top 40",
+ [61] = "Christian Rap",
+ [62] = "Pop/Funk",
+ [63] = "Jungle",
+ [64] = "Native American",
+ [65] = "Cabaret",
+ [66] = "New Wave",
+ [67] = "Psychadelic",
+ [68] = "Rave",
+ [69] = "Showtunes",
+ [70] = "Trailer",
+ [71] = "Lo-Fi",
+ [72] = "Tribal",
+ [73] = "Acid Punk",
+ [74] = "Acid Jazz",
+ [75] = "Polka",
+ [76] = "Retro",
+ [77] = "Musical",
+ [78] = "Rock & Roll",
+ [79] = "Hard Rock",
+ [80] = "Folk",
+ [81] = "Folk-Rock",
+ [82] = "National Folk",
+ [83] = "Swing",
+ [84] = "Fast Fusion",
+ [85] = "Bebob",
+ [86] = "Latin",
+ [87] = "Revival",
+ [88] = "Celtic",
+ [89] = "Bluegrass",
+ [90] = "Avantgarde",
+ [91] = "Gothic Rock",
+ [92] = "Progressive Rock",
+ [93] = "Psychedelic Rock",
+ [94] = "Symphonic Rock",
+ [95] = "Slow Rock",
+ [96] = "Big Band",
+ [97] = "Chorus",
+ [98] = "Easy Listening",
+ [99] = "Acoustic",
[100] = "Humour",
[101] = "Speech",
[102] = "Chanson",
Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c Thu Jun 11 17:26:57 2009 (r19155)
+++ trunk/libavformat/id3v2.c Thu Jun 11 17:35:23 2009 (r19156)
@@ -25,24 +25,24 @@
int ff_id3v2_match(const uint8_t *buf)
{
- return buf[0] == 'I' &&
- buf[1] == 'D' &&
- buf[2] == '3' &&
- buf[3] != 0xff &&
- buf[4] != 0xff &&
- (buf[6] & 0x80) == 0 &&
- (buf[7] & 0x80) == 0 &&
- (buf[8] & 0x80) == 0 &&
- (buf[9] & 0x80) == 0;
+ return buf[0] == 'I' &&
+ buf[1] == 'D' &&
+ buf[2] == '3' &&
+ buf[3] != 0xff &&
+ buf[4] != 0xff &&
+ (buf[6] & 0x80) == 0 &&
+ (buf[7] & 0x80) == 0 &&
+ (buf[8] & 0x80) == 0 &&
+ (buf[9] & 0x80) == 0;
}
int ff_id3v2_tag_len(const uint8_t * buf)
{
int len = ((buf[6] & 0x7f) << 21) +
- ((buf[7] & 0x7f) << 14) +
- ((buf[8] & 0x7f) << 7) +
- (buf[9] & 0x7f) +
- ID3v2_HEADER_SIZE;
+ ((buf[7] & 0x7f) << 14) +
+ ((buf[8] & 0x7f) << 7) +
+ (buf[9] & 0x7f) +
+ ID3v2_HEADER_SIZE;
if (buf[5] & 0x10)
len += ID3v2_HEADER_SIZE;
return len;
@@ -50,9 +50,9 @@ int ff_id3v2_tag_len(const uint8_t * buf
static unsigned int get_size(ByteIOContext *s, int len)
{
- int v=0;
- while(len--)
- v= (v<<7) + (get_byte(s)&0x7F);
+ int v = 0;
+ while (len--)
+ v = (v << 7) + (get_byte(s) & 0x7F);
return v;
}
@@ -62,17 +62,17 @@ static void read_ttag(AVFormatContext *s
int len, dstlen = sizeof(dst) - 1;
unsigned genre;
- dst[0]= 0;
- if(taglen < 1)
+ dst[0] = 0;
+ if (taglen < 1)
return;
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) */
q = dst;
- while(taglen--) {
+ while (taglen--) {
uint8_t 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
break;
case 3: /* UTF-8 */
- len = FFMIN(taglen, dstlen-1);
+ len = FFMIN(taglen, dstlen - 1);
get_buffer(s->pb, dst, len);
dst[len] = 0;
break;
@@ -103,9 +103,9 @@ void ff_id3v2_parse(AVFormatContext *s,
int taghdrlen;
const char *reason;
- switch(version) {
+ switch (version) {
case 2:
- if(flags & 0x40) {
+ if (flags & 0x40) {
reason = "compression";
goto error;
}
@@ -124,16 +124,16 @@ void ff_id3v2_parse(AVFormatContext *s,
goto error;
}
- if(flags & 0x80) {
+ if (flags & 0x80) {
reason = "unsynchronization";
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));
- while(len >= taghdrlen) {
- if(isv34) {
+ while (len >= taghdrlen) {
+ if (isv34) {
tag = get_be32(s->pb);
tlen = get_size(s->pb, 4);
get_be16(s->pb); /* flags */
@@ -143,12 +143,12 @@ void ff_id3v2_parse(AVFormatContext *s,
}
len -= taghdrlen + tlen;
- if(len < 0)
+ if (len < 0)
break;
next = url_ftell(s->pb) + tlen;
- switch(tag) {
+ switch (tag) {
case MKBETAG('T', 'I', 'T', '2'):
case MKBETAG(0, 'T', 'T', '2'):
read_ttag(s, tlen, "title");
@@ -183,7 +183,7 @@ void ff_id3v2_parse(AVFormatContext *s,
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);
return;
@@ -191,4 +191,3 @@ void ff_id3v2_parse(AVFormatContext *s,
av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason);
url_fskip(s->pb, len);
}
-
More information about the ffmpeg-cvslog
mailing list