smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

ptformat: Update to upstream 55f08d8 (simplify version detection)

Browse source
This commit is contained in:
Damien Zammit 2020-02-02 18:09:26 +11:00
parent 4c29eb5b6a
commit 8264865dd8
1 changed files with 19 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

85
libs/ptformat/ptformat.cc
View file

@ -463,74 +463,16 @@ PTFFormat::load(std::string const& ptf, int64_t targetsr) {
bool bool
PTFFormat::parse_version() { PTFFormat::parse_version() {
uint32_t seg_len,str_len; bool failed = true;
uint8_t *data = _ptfunxored + 0x14; struct block_t b;
uintptr_t data_end = ((uintptr_t)_ptfunxored) + 0x100;
uint8_t seg_type;
bool success = false;
if (_ptfunxored[0] != '\x03' && foundat(_ptfunxored, 0x100, BITCODE) != 1) { if (_ptfunxored[0] != '\x03' && foundat(_ptfunxored, 0x100, BITCODE) != 1) {
return false; return failed;
} }
while( ((uintptr_t)data < data_end) && (success == false) ) { is_bigendian = !!_ptfunxored[0x11];
if (data[0] != 0x5a) { if (!parse_block_at(0x1f, &b, NULL, 0)) {
success = false;
break;
}
seg_type = data[1];
/* Skip segment header */
data += 3;
if (data[0] == 0 && data[1] == 0) {
/* BE */
is_bigendian = true;
} else {
/* LE */
is_bigendian = false;
}
seg_len = u_endian_read4(&data[0], is_bigendian);
/* Skip seg_len */
data += 4;
if (!(seg_type == 0x04 || seg_type == 0x03) || data[0] != 0x03) {
/* Go to next segment */
data += seg_len;
continue;
}
/* Skip 0x03 0x00 0x00 */
data += 3;
seg_len -= 3;
str_len = (*(uint8_t *)data);
if (! (_product = (uint8_t *)malloc((str_len+1) * sizeof(uint8_t)))) {
success = false;
break;
}
/* Skip str_len */
data += 4;
seg_len -= 4;
memcpy(_product, data, str_len);
_product[str_len] = 0;
data += str_len;
seg_len -= str_len;
/* Skip 0x03 0x00 0x00 0x00 */
data += 4;
seg_len -= 4;
_version = data[0];
if (_version == 0) {
_version = data[3];
}
data += seg_len;
success = true;
}
/* If the above does not work, try other heuristics */
if ((uintptr_t)data >= data_end - seg_len) {
_version = _ptfunxored[0x40]; _version = _ptfunxored[0x40];
if (_version == 0) { if (_version == 0) {
_version = _ptfunxored[0x3d]; _version = _ptfunxored[0x3d];
@ -538,11 +480,22 @@ PTFFormat::parse_version() {
if (_version == 0) { if (_version == 0) {
_version = _ptfunxored[0x3a] + 2; _version = _ptfunxored[0x3a] + 2;
} }
if (_version != 0) { if (_version != 0)
success = true; failed = false;
return failed;
} else {
if (b.content_type == 0x0003) {
// old
uint16_t skip = parsestring(b.offset + 3).size() + 8;
_version = u_endian_read4(&_ptfunxored[b.offset + 3 + skip], is_bigendian);
failed = false;
} else if (b.content_type == 0x2067) {
// new
_version = 2 + u_endian_read4(&_ptfunxored[b.offset + 20], is_bigendian);
failed = false;
} }
return failed;
} }
return (!success);
} }
uint8_t uint8_t