summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-06-27 20:31:33 +0200
committerGravatar Alexey Yakovenko <waker@users.sourceforge.net>2014-06-27 20:31:33 +0200
commit7729999b9170601154156a762062f1d5cc3d20dd (patch)
treece3396f4f128cce2b85117d1e4f4c7e1576813ba
parent5267c9b2c585417566a4e28da23e81548000d2d7 (diff)
junklib: fixed conversion of id3v2.3<->id3v2.4 frame header ext flags; added support for id3v2.4 data length indicator when converting
-rw-r--r--junklib.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/junklib.c b/junklib.c
index 0a9a946d..ea944fb8 100644
--- a/junklib.c
+++ b/junklib.c
@@ -2092,11 +2092,11 @@ junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
flags[0] = f24->flags[0] << 1;
// 2nd byte (format flags) is quite different
- // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
- // 2.3 format is %ijk00000 (compression, encryption, grouping)
+ // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+ // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
flags[1] = 0;
if (f24->flags[1] & (1 << 6)) {
- flags[1] |= (1 << 4);
+ flags[1] |= (1 << 5);
}
if (f24->flags[1] & (1 << 3)) {
flags[1] |= (1 << 7);
@@ -2105,19 +2105,26 @@ junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
flags[1] |= (1 << 6);
}
if (f24->flags[1] & (1 << 1)) {
- flags[1] |= (1 << 5);
- }
- if (f24->flags[1] & 1) {
// 2.3 doesn't support per-frame unsyncronyzation
- // let's ignore it
+ }
+ if (f24->flags[1] & (1 << 0)) {
+ // 2.3 doesn't support data length, but remember to skip 4 bytes of
+ // the frame
}
if (simplecopy) {
f23 = malloc (sizeof (DB_id3v2_frame_t) + f24->size);
memset (f23, 0, sizeof (DB_id3v2_frame_t) + f24->size);
strcpy (f23->id, f24->id);
- f23->size = f24->size;
- memcpy (f23->data, f24->data, f24->size);
+ if (f24->flags[1] & (1<<0)) {
+ // skip 1st 4 frames
+ memcpy (f23->data, f24->data+4, f24->size-4);
+ f23->size = f24->size-4;
+ }
+ else {
+ f23->size = f24->size;
+ memcpy (f23->data, f24->data, f24->size);
+ }
f23->flags[0] = flags[0];
f23->flags[1] = flags[1];
}
@@ -2277,12 +2284,9 @@ junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
flags[0] = f23->flags[0] >> 1;
// 2nd byte (format flags) is quite different
- // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
- // 2.3 format is %ijk00000 (compression, encryption, grouping)
+ // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+ // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
flags[1] = 0;
- if (f23->flags[1] & (1 << 4)) {
- flags[1] |= (1 << 6);
- }
if (f23->flags[1] & (1 << 7)) {
flags[1] |= (1 << 3);
}
@@ -2290,7 +2294,7 @@ junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
flags[1] |= (1 << 2);
}
if (f23->flags[1] & (1 << 5)) {
- flags[1] |= (1 << 1);
+ flags[1] |= (1 << 6);
}
DB_id3v2_frame_t *f24 = NULL;