diff options
Diffstat (limited to 'lib/rbcodec/metadata/metadata_common.c')
-rw-r--r-- | lib/rbcodec/metadata/metadata_common.c | 117 |
1 files changed, 75 insertions, 42 deletions
diff --git a/lib/rbcodec/metadata/metadata_common.c b/lib/rbcodec/metadata/metadata_common.c index 6fc50e9a9d..f051c94e2c 100644 --- a/lib/rbcodec/metadata/metadata_common.c +++ b/lib/rbcodec/metadata/metadata_common.c @@ -148,17 +148,20 @@ int read_uint64le(int fd, uint64_t* buf) uint64_t get_uint64_le(void* buf) { unsigned char* p = (unsigned char*) buf; - - return ((uint64_t)p[0]) | ((uint64_t)p[1] << 8) | ((uint64_t)p[2] << 16) | ((uint64_t)p[3] << 24) | ((uint64_t)p[4] << 32) | - ((uint64_t)p[5] << 40) | ((uint64_t)p[6] << 48) | ((uint64_t)p[7] << 56); + #define u64(v) (uint64_t)v + return (u64(p[0])) | ((u64(p[1])) << 8) | ((u64(p[2])) << 16) + | ((u64(p[3])) << 24) | ((u64(p[4])) << 32) |((u64(p[5])) << 40) + | ((u64(p[6])) << 48) | ((u64(p[7])) << 56); + #undef u64 } /* Read an unaligned 32-bit little endian long from buffer. */ uint32_t get_long_le(void* buf) { unsigned char* p = (unsigned char*) buf; - - return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); + #define u32(v) (uint32_t)v + return (u32(p[0])) | ((u32(p[1])) << 8) | ((u32(p[2])) << 16) | ((u32(p[3])) << 24); + #undef u32 } /* Read an unaligned 16-bit little endian short from buffer. */ @@ -166,15 +169,16 @@ uint16_t get_short_le(void* buf) { unsigned char* p = (unsigned char*) buf; - return p[0] | (p[1] << 8); + return ((uint16_t)p[0]) | (((uint16_t)p[1]) << 8); } /* Read an unaligned 32-bit big endian long from buffer. */ uint32_t get_long_be(void* buf) { unsigned char* p = (unsigned char*) buf; - - return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; + #define u32(v) (uint32_t)v + return ((u32(p[0])) << 24) | ((u32(p[1])) << 16) | ((u32(p)[2]) << 8) | (u32(p[3])); + #undef u32 } /* Read an unaligned 16-bit little endian short from buffer. */ @@ -182,15 +186,16 @@ uint16_t get_short_be(void* buf) { unsigned char* p = (unsigned char*) buf; - return (p[0] << 8) | p[1]; + return (((uint16_t)p[0]) << 8) | ((uint16_t)p[1]); } /* Read an unaligned 32-bit little endian long from buffer. */ int32_t get_slong(void* buf) { unsigned char* p = (unsigned char*) buf; - - return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); + #define i32(v) (int32_t)v + return (i32(p[0])) | ((i32(p[1])) << 8) | ((i32(p[2])) << 16) | ((i32(p[3])) << 24); + #undef i32 } uint32_t get_itunes_int32(char* value, int count) @@ -252,6 +257,26 @@ bool skip_id3v2(int fd, struct mp3entry *id3) return success; } +#if !defined(ROCKBOX) || defined(WARBLE) /*codecs can be built without rockbox */ +/* returns match index from option list + * returns -1 if option was not found + * option list is array of char pointers with the final item set to null + * ex - const char *option[] = { "op_a", "op_b", "op_c", NULL} + */ +int string_option(const char *option, const char *const oplist[], bool ignore_case) +{ + const char *op; + int (*cmp_fn)(const char*, const char*) = &strcasecmp; + if (!ignore_case) + cmp_fn = strcmp; + for (int i=0; (op=oplist[i]) != NULL; i++) + { + if (cmp_fn(op, option) == 0) + return i; + } + return -1; +} +#endif /* Parse the tag (the name-value pair) and fill id3 and buffer accordingly. * String values to keep are written to buf. Returns number of bytes written * to buf (including end nil). @@ -262,19 +287,44 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, long len = 0; char** p; - if ((((strcasecmp(name, "track") == 0) && (type == TAGTYPE_APE))) - || ((strcasecmp(name, "tracknumber") == 0) && (type == TAGTYPE_VORBIS))) + enum + { + eTRACK = 0, eTRACKNUMBER, eDISCNUMBER, eDISC, + eYEAR, eDATE, eTITLE, eARTIST, eALBUM, eGENRE, + eCOMPOSER, eCOMMENT, eALBUMARTIST, eALBUM_ARTIST, + eENSEMBLE, eGROUPING, eCONTENTGROUP, eCONTENT_GROUP, + eMUSICBRAINZ1, eMUSICBRAINZ2, e_COUNT_TAG_COUNT + }; + + static const char *tagops[e_COUNT_TAG_COUNT + 1] = + { [eTRACK] = "track", [eTRACKNUMBER] = "tracknumber", + [eDISCNUMBER] = "discnumber", [eDISC] = "disc", + [eYEAR] = "year", [eDATE] = "date", [eTITLE] = "title", + [eARTIST] = "artist", [eALBUM] = "album", [eGENRE] = "genre", + [eCOMPOSER] = "composer", [eCOMMENT] = "comment", + [eALBUMARTIST] = "albumartist", [eALBUM_ARTIST] ="album artist", + [eENSEMBLE] = "ensemble", [eGROUPING] = "grouping", + [eCONTENTGROUP] = "contentgroup", [eCONTENT_GROUP] = "content group", + [eMUSICBRAINZ1] = "musicbrainz_trackid", + [eMUSICBRAINZ2] = "http://musicbrainz.org", + [e_COUNT_TAG_COUNT] = NULL + }; + + int item = string_option(name, tagops, true); + + if (((item == eTRACK && (type == TAGTYPE_APE))) + || (item == eTRACKNUMBER && (type == TAGTYPE_VORBIS))) { id3->tracknum = atoi(value); p = &(id3->track_string); } - else if (strcasecmp(name, "discnumber") == 0 || strcasecmp(name, "disc") == 0) + else if (item == eDISCNUMBER || item == eDISC) { id3->discnum = atoi(value); p = &(id3->disc_string); } - else if (((strcasecmp(name, "year") == 0) && (type == TAGTYPE_APE)) - || ((strcasecmp(name, "date") == 0) && (type == TAGTYPE_VORBIS))) + else if ((item == eYEAR && (type == TAGTYPE_APE)) + || (item == eDATE && (type == TAGTYPE_VORBIS))) { /* Date's can be in any format in Vorbis. However most of them * are in ISO8601 format so if we try and parse the first part @@ -288,56 +338,39 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, } p = &(id3->year_string); } - else if (strcasecmp(name, "title") == 0) + else if (item == eTITLE) { p = &(id3->title); } - else if (strcasecmp(name, "artist") == 0) + else if (item == eARTIST) { p = &(id3->artist); } - else if (strcasecmp(name, "album") == 0) + else if (item == eALBUM) { p = &(id3->album); } - else if (strcasecmp(name, "genre") == 0) + else if (item == eGENRE) { p = &(id3->genre_string); } - else if (strcasecmp(name, "composer") == 0) + else if (item == eCOMPOSER) { p = &(id3->composer); } - else if (strcasecmp(name, "comment") == 0) + else if (item == eCOMMENT) { p = &(id3->comment); } - else if (strcasecmp(name, "albumartist") == 0) + else if (item == eALBUMARTIST || item == eALBUM_ARTIST || item == eENSEMBLE) { p = &(id3->albumartist); } - else if (strcasecmp(name, "album artist") == 0) - { - p = &(id3->albumartist); - } - else if (strcasecmp(name, "ensemble") == 0) - { - p = &(id3->albumartist); - } - else if (strcasecmp(name, "grouping") == 0) - { - p = &(id3->grouping); - } - else if (strcasecmp(name, "content group") == 0) - { - p = &(id3->grouping); - } - else if (strcasecmp(name, "contentgroup") == 0) + else if (item == eGROUPING || item == eCONTENTGROUP || item == eCONTENT_GROUP) { p = &(id3->grouping); } - else if (strcasecmp(name, "musicbrainz_trackid") == 0 - || strcasecmp(name, "http://musicbrainz.org") == 0 ) + else if (item == eMUSICBRAINZ1 || item == eMUSICBRAINZ2) { p = &(id3->mb_track_id); } |