aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement track type handling for optical images in write.c and context.h

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-03 15:25:01 +01:00
parent 3f94512c56
commit 38b9d1fa26
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/aaruformat/context.h
View File

@@ -229,6 +229,8 @@ typedef struct aaruformatContext
spamsum_ctx *spamsum_context; ///< Opaque SpamSum context for streaming updates spamsum_ctx *spamsum_context; ///< Opaque SpamSum context for streaming updates
bool calculating_blake3; ///< True if whole-image BLAKE3 being calculated on-the-fly. bool calculating_blake3; ///< True if whole-image BLAKE3 being calculated on-the-fly.
blake3_hasher *blake3_context; ///< Opaque BLAKE3 context for streaming updates blake3_hasher *blake3_context; ///< Opaque BLAKE3 context for streaming updates
uint8_t currentTrackType; ///< Current track type (when writing optical images with tracks, needed for block
///< compression type).
} aaruformatContext; } aaruformatContext;
/** \struct DumpHardwareEntriesWithData /** \struct DumpHardwareEntriesWithData

34
src/write.c
View File

@@ -183,8 +183,6 @@ int32_t aaruf_write_sector(void *context, uint64_t sector_address, bool negative
if(ctx->calculating_blake3 && !negative && sector_address <= ctx->imageInfo.Sectors) if(ctx->calculating_blake3 && !negative && sector_address <= ctx->imageInfo.Sectors)
blake3_hasher_update(ctx->blake3_context, data, length); blake3_hasher_update(ctx->blake3_context, data, length);
// TODO: If optical disc check track
// Close current block first // Close current block first
if(ctx->writingBuffer != NULL && if(ctx->writingBuffer != NULL &&
// When sector size changes // When sector size changes
@@ -254,7 +252,37 @@ int32_t aaruf_write_sector(void *context, uint64_t sector_address, bool negative
ctx->currentBlockHeader.compression = None; // TODO: Compression ctx->currentBlockHeader.compression = None; // TODO: Compression
ctx->currentBlockHeader.sectorSize = length; ctx->currentBlockHeader.sectorSize = length;
// TODO: Optical discs // We need to save the track type for later compression
if(ctx->imageInfo.XmlMediaType == OpticalDisc && ctx->trackEntries != NULL)
{
const TrackEntry *track = NULL;
for(int i = 0; i < ctx->tracksHeader.entries; i++)
if(sector_address >= ctx->trackEntries[i].start && sector_address <= ctx->trackEntries[i].end)
{
track = &ctx->trackEntries[i];
break;
}
if(track != NULL)
{
ctx->currentTrackType = track->type;
if(track->sequence == 0 && track->start == 0 && track->end == 0) ctx->currentTrackType = Data;
}
else
ctx->currentTrackType = Data;
if(ctx->currentTrackType == Audio &&
// JaguarCD stores data in audio tracks. FLAC is too inefficient, we need to use LZMA as data.
(ctx->imageInfo.MediaType == JaguarCD && track->session > 1 ||
// VideoNow stores video in audio tracks, and LZMA works better too.
ctx->imageInfo.MediaType == VideoNow || ctx->imageInfo.MediaType == VideoNowColor ||
ctx->imageInfo.MediaType == VideoNowXp))
ctx->currentTrackType = Data;
}
else
ctx->currentTrackType = Data;
uint32_t max_buffer_size = (1 << ctx->userDataDdtHeader.dataShift) * ctx->currentBlockHeader.sectorSize; uint32_t max_buffer_size = (1 << ctx->userDataDdtHeader.dataShift) * ctx->currentBlockHeader.sectorSize;
TRACE("Setting max buffer size to %u bytes", max_buffer_size); TRACE("Setting max buffer size to %u bytes", max_buffer_size);