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

Update libaaf to v1.0-29-gd8fb51c

Browse source
This commit is contained in:
agfline 2025-06-26 09:53:49 +02:00
parent a2c8203a19
commit e2d6ec016f
5 changed files with 61 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/aaf/AAFIEssenceFile.c
View file

@ -864,21 +864,10 @@ externalAudioDataReaderCallback (unsigned char* buf, size_t offset, size_t reqle
const char* filename = (const char*)user2; const char* filename = (const char*)user2;
AAF_Iface* aafi = (AAF_Iface*)user3; AAF_Iface* aafi = (AAF_Iface*)user3;
#ifdef _WIN32 if (fseek64 (fp, (int64_t)offset, SEEK_SET) < 0) {
assert (offset < _I64_MAX);
if (_fseeki64 (fp, (__int64)offset, SEEK_SET) < 0) {
error ("Could not seek to %" PRIu64 " in file '%s' : %s", offset, filename, strerror (errno)); error ("Could not seek to %" PRIu64 " in file '%s' : %s", offset, filename, strerror (errno));
return RIFF_READER_ERROR; return RIFF_READER_ERROR;
} }
#else
assert (offset < LONG_MAX);
if (fseek (fp, (long)offset, SEEK_SET) < 0) {
error ("Could not seek to %" PRIu64 " in file '%s' : %s", offset, filename, strerror (errno));
return RIFF_READER_ERROR;
}
#endif
size_t byteRead = fread (buf, sizeof (unsigned char), reqlen, fp); size_t byteRead = fread (buf, sizeof (unsigned char), reqlen, fp);

98
libs/aaf/LibCFB.c
View file

@ -411,26 +411,15 @@ cfb_is_valid (CFB_Data* cfbd)
static int static int
cfb_getFileSize (CFB_Data* cfbd) cfb_getFileSize (CFB_Data* cfbd)
{ {
#ifdef _WIN32 if (fseek64 (cfbd->fp, 0LL, SEEK_END) < 0) {
if (_fseeki64 (cfbd->fp, 0L, SEEK_END) < 0) { error ("fseek64() failed : %s.", strerror (errno));
error ("fseek() failed : %s.", strerror (errno));
return -1; return -1;
} }
__int64 filesz = _ftelli64 (cfbd->fp); int64_t filesz = ftell64 (cfbd->fp);
#else
if (fseek (cfbd->fp, 0L, SEEK_END) < 0) {
error ("fseek() failed : %s.", strerror (errno));
return -1;
}
long filesz = ftell (cfbd->fp);
#endif
if (filesz < 0) { if (filesz < 0) {
error ("ftell() failed : %s.", strerror (errno)); error ("ftell64() failed : %s.", strerror (errno));
return -1; return -1;
} }
@ -486,17 +475,17 @@ cfb_readFile (CFB_Data* cfbd, unsigned char* buf, size_t offset, size_t reqlen)
// debug( "Requesting file read @ offset %"PRIu64" of length %"PRIu64, offset, reqlen ); // debug( "Requesting file read @ offset %"PRIu64" of length %"PRIu64, offset, reqlen );
if (offset >= LONG_MAX) {
error ("Requested data offset is bigger than LONG_MAX");
return 0;
}
if (reqlen + offset > cfbd->file_sz) { if (reqlen + offset > cfbd->file_sz) {
error ("Requested data goes %" PRIu64 " bytes beyond the EOF : offset %" PRIu64 " | length %" PRIu64 "", (reqlen + offset) - cfbd->file_sz, offset, reqlen); error ("Requested data goes %" PRIu64 " bytes beyond the EOF : offset %" PRIu64 " | length %" PRIu64 "", (reqlen + offset) - cfbd->file_sz, offset, reqlen);
return 0; return 0;
} }
int rc = fseek (fp, (long)offset, SEEK_SET); if (offset > INT64_MAX) {
error ("File offset %" PRIu64 " is beyond INT64_MAX", offset);
return 0;
}
int rc = fseek64 (fp, (int64_t)offset, SEEK_SET);
if (rc < 0) { if (rc < 0) {
error ("%s.", strerror (errno)); error ("%s.", strerror (errno));
@ -565,8 +554,8 @@ cfb_getSector (CFB_Data* cfbd, cfbSectorID_t id)
return NULL; return NULL;
} }
uint64_t sectorSize = (1 << cfbd->hdr->_uSectorShift); uint64_t sectorSize = (1ULL << cfbd->hdr->_uSectorShift);
uint64_t fileOffset = (id + 1) << cfbd->hdr->_uSectorShift; uint64_t fileOffset = (id + 1ULL) << cfbd->hdr->_uSectorShift;
unsigned char* buf = calloc (1, sectorSize); unsigned char* buf = calloc (1, sectorSize);
@ -652,8 +641,8 @@ cfb_getMiniSector (CFB_Data* cfbd, cfbSectorID_t id)
fatId = cfbd->fat[fatId]; fatId = cfbd->fat[fatId];
} }
offset = ((fatId + 1) << cfbd->hdr->_uSectorShift); offset = (fatId + 1ULL) << cfbd->hdr->_uSectorShift;
offset += ((id % fatDiv) << cfbd->hdr->_uMiniSectorShift); offset += (id % fatDiv) << cfbd->hdr->_uMiniSectorShift;
if (cfb_readFile (cfbd, buf, offset, MiniSectorSize) == 0) { if (cfb_readFile (cfbd, buf, offset, MiniSectorSize) == 0) {
goto err; goto err;
@ -714,24 +703,24 @@ cfb_getStream (CFB_Data* cfbd, cfbNode* node, unsigned char** stream, uint64_t*
return 0; return 0;
} }
cpy_sz = ((stream_len - offset) < (uint64_t)(1 << cfbd->hdr->_uMiniSectorShift)) ? (stream_len - offset) : (uint64_t)(1 << cfbd->hdr->_uMiniSectorShift); cpy_sz = ((stream_len - offset) < (1ULL << cfbd->hdr->_uMiniSectorShift)) ? (stream_len - offset) : (1ULL << cfbd->hdr->_uMiniSectorShift);
memcpy (*stream + offset, buf, cpy_sz); memcpy (*stream + offset, buf, cpy_sz);
free (buf); free (buf);
offset += (1 << cfbd->hdr->_uMiniSectorShift); offset += (1ULL << cfbd->hdr->_uMiniSectorShift);
} }
} else { } else {
CFB_foreachSectorInChain (cfbd, buf, id) CFB_foreachSectorInChain (cfbd, buf, id)
{ {
cpy_sz = ((stream_len - offset) < (uint64_t)(1 << cfbd->hdr->_uSectorShift)) ? (stream_len - offset) : (uint64_t)(1 << cfbd->hdr->_uSectorShift); cpy_sz = ((stream_len - offset) < (1ULL << cfbd->hdr->_uSectorShift)) ? (stream_len - offset) : (1ULL << cfbd->hdr->_uSectorShift);
memcpy (*stream + offset, buf, cpy_sz); memcpy (*stream + offset, buf, cpy_sz);
free (buf); free (buf);
offset += (1 << cfbd->hdr->_uSectorShift); offset += (1ULL << cfbd->hdr->_uSectorShift);
} }
} }
@ -780,12 +769,12 @@ cfb__foreachSectorInStream (CFB_Data* cfbd, cfbNode* node, unsigned char** buf,
if (stream_sz < cfbd->hdr->_ulMiniSectorCutoff) { if (stream_sz < cfbd->hdr->_ulMiniSectorCutoff) {
/* Mini-Stream */ /* Mini-Stream */
*buf = cfb_getMiniSector (cfbd, *sectID); *buf = cfb_getMiniSector (cfbd, *sectID);
*bytesRead = (1 << cfbd->hdr->_uMiniSectorShift); *bytesRead = (1ULL << cfbd->hdr->_uMiniSectorShift);
*sectID = cfbd->miniFat[*sectID]; *sectID = cfbd->miniFat[*sectID];
} else { } else {
/* Stream */ /* Stream */
*buf = cfb_getSector (cfbd, *sectID); *buf = cfb_getSector (cfbd, *sectID);
*bytesRead = (1 << cfbd->hdr->_uSectorShift); *bytesRead = (1ULL << cfbd->hdr->_uSectorShift);
*sectID = cfbd->fat[*sectID]; *sectID = cfbd->fat[*sectID];
} }
@ -868,7 +857,7 @@ cfb_retrieveDiFAT (CFB_Data* cfbd)
* _uSectorShift is guaranted to be 9 or 12, so DiFAT_sz will never override UINT_MAX * _uSectorShift is guaranted to be 9 or 12, so DiFAT_sz will never override UINT_MAX
*/ */
size_t DiFAT_sz = cfbd->hdr->_csectDif * (((1 << cfbd->hdr->_uSectorShift) / sizeof (cfbSectorID_t)) - 1) + 109; size_t DiFAT_sz = cfbd->hdr->_csectDif * (((1ULL << cfbd->hdr->_uSectorShift) / sizeof (cfbSectorID_t)) - 1) + 109;
if (DiFAT_sz >= UINT_MAX) { if (DiFAT_sz >= UINT_MAX) {
error ("DiFAT size is bigger than UINT_MAX : %lu", DiFAT_sz); error ("DiFAT size is bigger than UINT_MAX : %lu", DiFAT_sz);
@ -894,7 +883,11 @@ cfb_retrieveDiFAT (CFB_Data* cfbd)
uint64_t cnt = 0; uint64_t cnt = 0;
/* _uSectorShift is guaranted to be 9 or 12, so sectorSize will never be negative */ /*
* _uSectorShift is guaranted to be 9 or 12, so sectorSize will never be negative.
* -4U excludes the last 4bytes of the sector (those represents next DiFAT sector
* index, in DiFAT chain).
*/
uint32_t sectorSize = (1U << cfbd->hdr->_uSectorShift) - 4U; uint32_t sectorSize = (1U << cfbd->hdr->_uSectorShift) - 4U;
CFB_foreachSectorInDiFATChain (cfbd, buf, id) CFB_foreachSectorInDiFATChain (cfbd, buf, id)
@ -904,32 +897,29 @@ cfb_retrieveDiFAT (CFB_Data* cfbd)
goto err; goto err;
} }
// debug( "Retrieved DiFAT[%i]", id );
memcpy ((unsigned char*)DiFAT + offset, buf, sectorSize); memcpy ((unsigned char*)DiFAT + offset, buf, sectorSize);
offset += sectorSize; offset += sectorSize;
cnt++; cnt++;
/* /* done */
* If we count more DiFAT sector when parsing than if (cnt >= cfbd->hdr->_csectDif) {
* there should be, it means the sector list does /* retrieves next DiFAT index of the last sector, to ensure chain is ending properly */
* not end by a proper CFB_END_OF_CHAIN. memcpy (&id, buf + sectorSize, sizeof (uint32_t));
*/
if (id != CFB_END_OF_CHAIN /*&& id != CFB_FREE_SECT*/) {
warning ("Incorrect end of DiFAT Chain 0x%08x (%d)", id, id);
}
if (cnt >= cfbd->hdr->_csectDif)
break; break;
}
} }
free (buf); free (buf);
buf = NULL; buf = NULL;
/*
* Standard says DIFAT should end with a CFB_END_OF_CHAIN index,
* however it has been observed that some files end with CFB_FREE_SECT.
* So we consider it ok.
*/
if (id != CFB_END_OF_CHAIN /*&& id != CFB_FREE_SECT*/)
warning ("Incorrect end of DiFAT Chain 0x%08x (%d)", id, id);
cfbd->DiFAT = DiFAT; cfbd->DiFAT = DiFAT;
cfbd->DiFAT_sz = (uint32_t)DiFAT_sz; cfbd->DiFAT_sz = (uint32_t)DiFAT_sz;
@ -975,7 +965,7 @@ cfb_retrieveFAT (CFB_Data* cfbd)
if (cfbd->DiFAT[id] == CFB_FREE_SECT) if (cfbd->DiFAT[id] == CFB_FREE_SECT)
continue; continue;
// debug( "cfbd->DiFAT[id]: %u", cfbd->DiFAT[id] ); // debug( "cfbd->DiFAT[%u]: %u", id, cfbd->DiFAT[id] );
/* observed in fairlight's AAFs.. */ /* observed in fairlight's AAFs.. */
if (cfbd->DiFAT[id] == 0x00000000 && id > 0) { if (cfbd->DiFAT[id] == 0x00000000 && id > 0) {
@ -992,11 +982,11 @@ cfb_retrieveFAT (CFB_Data* cfbd)
return -1; return -1;
} }
memcpy (((unsigned char*)FAT) + offset, buf, (1 << cfbd->hdr->_uSectorShift)); memcpy (((unsigned char*)FAT) + offset, buf, (1ULL << cfbd->hdr->_uSectorShift));
free (buf); free (buf);
offset += (1 << cfbd->hdr->_uSectorShift); offset += (1ULL << cfbd->hdr->_uSectorShift);
} }
return 0; return 0;
@ -1032,11 +1022,11 @@ cfb_retrieveMiniFAT (CFB_Data* cfbd)
return -1; return -1;
} }
memcpy ((unsigned char*)miniFat + offset, buf, (1 << cfbd->hdr->_uSectorShift)); memcpy ((unsigned char*)miniFat + offset, buf, (1ULL << cfbd->hdr->_uSectorShift));
free (buf); free (buf);
offset += (1 << cfbd->hdr->_uSectorShift); offset += (1ULL << cfbd->hdr->_uSectorShift);
} }
cfbd->miniFat = miniFat; cfbd->miniFat = miniFat;
@ -1145,10 +1135,10 @@ cfb_retrieveNodes (CFB_Data* cfbd)
/* handle non-standard sector size, that is different than 512B or 4kB */ /* handle non-standard sector size, that is different than 512B or 4kB */
/* TODO has not been tested yet, should not even exist anyway */ /* TODO has not been tested yet, should not even exist anyway */
warning ("Parsing non-standard sector size !!! (%u bytes)", (1 << cfbd->hdr->_uSectorShift)); warning ("Parsing non-standard sector size !!! (%u bytes)", (1U << cfbd->hdr->_uSectorShift));
/* _uSectorShift is guaranted to be 9 or 12, so nodesPerSect will never override UINT_MAX */ /* _uSectorShift is guaranted to be 9 or 12, so nodesPerSect will never override UINT_MAX */
uint32_t nodesPerSect = (1U << cfbd->hdr->_uMiniSectorShift) / sizeof (cfbNode); size_t nodesPerSect = (1ULL << cfbd->hdr->_uMiniSectorShift) / sizeof (cfbNode);
CFB_foreachSectorInChain (cfbd, buf, id) CFB_foreachSectorInChain (cfbd, buf, id)
{ {

16
libs/aaf/aaf/LibCFB.h
View file

@ -30,13 +30,11 @@
#if defined(__linux__) #if defined(__linux__)
#include <limits.h> #include <limits.h>
#include <linux/limits.h> #include <linux/limits.h>
#elif defined(__APPLE__) #elif defined(__APPLE__) || defined(__NetBSD__)
#include <sys/syslimits.h> #include <sys/syslimits.h>
#elif defined(_WIN32) #elif defined(_WIN32)
#include <windows.h> // MAX_PATH #include <windows.h> // MAX_PATH
#include <limits.h> #include <limits.h>
#else
#include <limits.h>
#endif #endif
/** /**
@ -685,12 +683,12 @@ typedef struct CFB_Data {
* sector data. * sector data.
*/ */
#define CFB_foreachSectorInDiFATChain(cfbd, buf, id) \ #define CFB_foreachSectorInDiFATChain(cfbd, buf, id) \
for (id = cfbd->hdr->_sectDifStart, \ for (id = cfbd->hdr->_sectDifStart, \
buf = cfb_getSector (cfbd, id); \ buf = cfb_getSector (cfbd, id); \
id < CFB_MAX_REG_SECT; \ id < CFB_MAX_REG_SECT; \
memcpy (&id, (buf + (1 << cfbd->hdr->_uSectorShift) - 4), sizeof (uint32_t)), \ memcpy (&id, (buf + (1ULL << cfbd->hdr->_uSectorShift) - 4), sizeof (uint32_t)), \
free (buf), \ free (buf), \
buf = cfb_getSector (cfbd, id)) buf = cfb_getSector (cfbd, id))
/** /**

8
libs/aaf/aaf/utils.h
View file

@ -49,6 +49,14 @@ extern "C" {
#include <wchar.h> #include <wchar.h>
#endif #endif
#if defined(_WIN32)
#define fseek64 _fseeki64
#define ftell64 _ftelli64
#else
#define fseek64 fseek
#define ftell64 ftell
#endif
#define AAF_DIR_SEP '/' #define AAF_DIR_SEP '/'
#define AAF_DIR_SEP_STR "/" #define AAF_DIR_SEP_STR "/"

2
libs/aaf/aaf/version.h
View file

@ -1,2 +1,2 @@
#pragma once #pragma once
#define LIBAAF_VERSION "v1.0-22-gfab4651" #define LIBAAF_VERSION "v1.0-29-gd8fb51c"