Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-09-24 03:08:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean EAAC streamfile and prepare for EA-XMA

Browse Source
This commit is contained in:
bnnm 2018-08-25 09:57:46 +02:00
parent 6654e44517
commit 07ad3250f6
2 changed files with 167 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/meta/ea_eaac.c
View File

@ -638,7 +638,7 @@ static VGMSTREAM * init_vgmstream_eaaudiocore_header(STREAMFILE * streamHead, ST
vgmstream->layout_type = layout_segmented; vgmstream->layout_type = layout_segmented;
} }
else { else {
temp_streamFile = setup_eaac_streamfile(streamData, eaac.version, eaac.codec, eaac.streamed, eaac.stream_offset,0); temp_streamFile = setup_eaac_streamfile(streamData, eaac.version, eaac.codec, eaac.streamed,0,0, eaac.stream_offset);
if (!temp_streamFile) goto fail; if (!temp_streamFile) goto fail;
vgmstream->codec_data = init_mpeg_custom(temp_streamFile, start_offset, &vgmstream->coding_type, vgmstream->channels, type, &cfg); vgmstream->codec_data = init_mpeg_custom(temp_streamFile, start_offset, &vgmstream->coding_type, vgmstream->channels, type, &cfg);
@ -659,7 +659,6 @@ static VGMSTREAM * init_vgmstream_eaaudiocore_header(STREAMFILE * streamHead, ST
#ifdef VGM_USE_ATRAC9 #ifdef VGM_USE_ATRAC9
case EAAC_CODEC_EATRAX: { /* EATrax (unknown FourCC) [Need for Speed: Most Wanted (Vita)] */ case EAAC_CODEC_EATRAX: { /* EATrax (unknown FourCC) [Need for Speed: Most Wanted (Vita)] */
atrac9_config cfg = {0}; atrac9_config cfg = {0};
size_t total_size;
/* EATrax is "buffered" ATRAC9, uses custom IO since it's kind of complex to add to the decoder */ /* EATrax is "buffered" ATRAC9, uses custom IO since it's kind of complex to add to the decoder */
@ -668,14 +667,15 @@ static VGMSTREAM * init_vgmstream_eaaudiocore_header(STREAMFILE * streamHead, ST
cfg.channels = eaac.channels; cfg.channels = eaac.channels;
cfg.config_data = read_32bitBE(header_offset + 0x08,streamHead); cfg.config_data = read_32bitBE(header_offset + 0x08,streamHead);
/* 0x10: frame size? (same as config data?) */ /* 0x10: frame size? (same as config data?) */
total_size = read_32bitLE(header_offset + 0x0c,streamHead); /* actual data size without blocks, LE b/c why make sense */ /* actual data size without blocks, LE b/c why make sense (but don't use it in case of truncated files) */
//total_size = read_32bitLE(header_offset + 0x0c,streamHead);
vgmstream->codec_data = init_atrac9(&cfg); vgmstream->codec_data = init_atrac9(&cfg);
if (!vgmstream->codec_data) goto fail; if (!vgmstream->codec_data) goto fail;
vgmstream->coding_type = coding_ATRAC9; vgmstream->coding_type = coding_ATRAC9;
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
temp_streamFile = setup_eaac_streamfile(streamData, eaac.version, eaac.codec, eaac.streamed, eaac.stream_offset, total_size); temp_streamFile = setup_eaac_streamfile(streamData, eaac.version, eaac.codec, eaac.streamed,0,0, eaac.stream_offset);
if (!temp_streamFile) goto fail; if (!temp_streamFile) goto fail;
break; break;
@ -729,7 +729,6 @@ static segmented_layout_data* build_segmented_eaaudiocore_looping(STREAMFILE *st
segmented_layout_data *data = NULL; segmented_layout_data *data = NULL;
STREAMFILE* temp_streamFile[2] = {0}; STREAMFILE* temp_streamFile[2] = {0};
off_t offsets[2] = { eaac->stream_offset, eaac->loop_offset }; off_t offsets[2] = { eaac->stream_offset, eaac->loop_offset };
off_t sizes[2] = { eaac->stream_offset + eaac->loop_offset, 0}; /* 0 = let streamfile guess */
int num_samples[2] = { eaac->loop_start, eaac->num_samples - eaac->loop_start}; int num_samples[2] = { eaac->loop_start, eaac->num_samples - eaac->loop_start};
int segment_count = 2; /* intro/loop */ int segment_count = 2; /* intro/loop */
int i; int i;
@ -740,7 +739,7 @@ static segmented_layout_data* build_segmented_eaaudiocore_looping(STREAMFILE *st
if (!data) goto fail; if (!data) goto fail;
for (i = 0; i < segment_count; i++) { for (i = 0; i < segment_count; i++) {
temp_streamFile[i] = setup_eaac_streamfile(streamData, eaac->version,eaac->codec,eaac->streamed, offsets[i], sizes[i]); temp_streamFile[i] = setup_eaac_streamfile(streamData, eaac->version,eaac->codec,eaac->streamed,0,0, offsets[i]);
if (!temp_streamFile[i]) goto fail; if (!temp_streamFile[i]) goto fail;
data->segments[i] = allocate_vgmstream(eaac->channels, 0); data->segments[i] = allocate_vgmstream(eaac->channels, 0);

269
src/meta/ea_eaac_streamfile.h
View File

@ -2,141 +2,186 @@
#define _EA_EAAC_STREAMFILE_H_ #define _EA_EAAC_STREAMFILE_H_
#include "../streamfile.h" #include "../streamfile.h"
#define XMA_FRAME_SIZE 0x800
typedef struct { typedef struct {
/* state */
off_t logical_offset; /* offset that corresponds to physical_offset */
off_t physical_offset; /* actual file offset */
/* config */ /* config */
int version; int version;
int codec; int codec;
int streamed; int streamed;
off_t start_offset; int stream_number;
size_t total_size; /* size of the resulting substream */ int stream_count;
off_t stream_offset;
/* state */
off_t logical_offset; /* offset that corresponds to physical_offset */
off_t physical_offset; /* actual file offset */
uint32_t block_flag; /* current block flags */
size_t block_size; /* current block size */
size_t skip_size; /* size to skip from a block start to reach data start */
size_t data_size; /* logical size of the block */
size_t extra_size; /* extra padding/etc size of the block */
size_t logical_size;
} eaac_io_data; } eaac_io_data;
/* Reads skipping EA's block headers, so the resulting data is smaller or larger than physical data. /* Reads skipping EA's block headers, so the resulting data is smaller or larger than physical data.
* physical/logical_offset should always be at the start of a block and only advance when a block is fully done */ * physical/logical_offset will be at the start of a block and only advance when a block is done */
static size_t eaac_io_read(STREAMFILE *streamfile, uint8_t *dest, off_t offset, size_t length, eaac_io_data* data) { static size_t eaac_io_read(STREAMFILE *streamfile, uint8_t *dest, off_t offset, size_t length, eaac_io_data* data) {
size_t total_read = 0; size_t total_read = 0;
/* ignore bad reads */ /* ignore bad reads */
if (offset < 0 || offset > data->total_size) { if (offset < 0 || offset > data->logical_size) {
return total_read; return total_read;
} }
/* previous offset: re-start as we can't map logical<>physical offsets /* previous offset: re-start as we can't map logical<>physical offsets
* (kinda slow as it trashes buffers, but shouldn't happen often) */ * (kinda slow as it trashes buffers, but shouldn't happen often) */
if (offset < data->logical_offset) { if (offset < data->logical_offset) {
data->physical_offset = data->start_offset; data->physical_offset = data->stream_offset;
data->logical_offset = 0x00; data->logical_offset = 0x00;
data->data_size = 0;
data->extra_size = 0;
} }
/* read doing one EA block at a time */ /* read blocks, one at a time */
while (length > 0) { while (length > 0) {
size_t to_read, bytes_read;
off_t intrablock_offset, intradata_offset;
uint32_t block_flag, block_size, data_size, skip_size;
block_flag = (uint8_t)read_8bit(data->physical_offset+0x00,streamfile); /* ignore EOF (implicitly handles block end flags) */
block_size = read_32bitBE(data->physical_offset+0x00,streamfile) & 0x00FFFFFF; if (data->logical_offset >= data->logical_size) {
if (data->version == 1 && block_flag == 0x48) {
data->physical_offset += block_size;
continue; /* skip header block */
}
if (data->version == 1 && block_flag == 0x45)
break; /* stop on last block (always empty) */
switch(data->codec) {
#if 0
case 0x03:
data_size = block_size - ???;
extra_size = (data_size % 0x800); /* deflated padding */
skip_size = 0x08 + 0x04*data->stream_count;
break; break;
#endif
case 0x05: /* EALayer3 v1 */
case 0x06: /* EALayer3 v2 "PCM" */
case 0x07: /* EALayer3 v2 "Spike" */
data_size = block_size - 0x08;
skip_size = 0x08;
break;
case 0x0a: /* EATrax */
data_size = read_32bitBE(data->physical_offset+0x04,streamfile); /* should be block_size - 0x08 */
skip_size = 0x08;
break;
default:
return total_read;
} }
/* requested offset is outside current block, try next */ /* process new block */
if (offset >= data->logical_offset + data_size) { if (data->data_size == 0) {
data->physical_offset += block_size; data->block_flag = (uint8_t)read_8bit(data->physical_offset+0x00,streamfile);
data->logical_offset += data_size; data->block_size = read_32bitBE(data->physical_offset+0x00,streamfile) & 0x00FFFFFF;
/* ignore header block */
if (data->version == 1 && data->block_flag == 0x48) {
data->physical_offset += data->block_size;
continue; continue;
} }
/* reads could fall in the middle of the block */ switch(data->codec) {
intradata_offset = offset - data->logical_offset; #if 0
intrablock_offset = skip_size + intradata_offset; case 0x03: { /* EA-XMA */
/* block format: 0x04=num-samples, (size*4 + N XMA packets) per stream (with 1/2ch XMA headers) */
int i;
/* clamp reads up to this block's end */ data->skip_size = 0x04 + 0x04;
to_read = (data_size - intradata_offset); for (i = 0; i < data->stream_number - 1; i++) {
if (to_read > length) data->skip_size += read_32bitBE(data->physical_offset+data->skip_size, streamfile) / 4;
to_read = length; }
if (to_read == 0) data->data_size = read_32bitBE(data->physical_offset+data->skip_size, streamfile) / 4; /* why size*4...? */
break; /* should never happen... */ data->skip_size += 0x04; /* skip mini header */
data->data_size -= 0x04; /* remove mini header */
if (data->data_size % XMA_FRAME_SIZE)
data->extra_size = XMA_FRAME_SIZE - (data->data_size % XMA_FRAME_SIZE);
break;
}
#endif
case 0x05: /* EALayer3 v1 */
case 0x06: /* EALayer3 v2 "PCM" */
case 0x07: /* EALayer3 v2 "Spike" */
data->skip_size = 0x08;
data->data_size = data->block_size - data->skip_size;
break;
/* finally read and move buffer/offsets */ case 0x0a: /* EATrax */
bytes_read = read_streamfile(dest, data->physical_offset + intrablock_offset, to_read, streamfile); data->skip_size = 0x08;
total_read += bytes_read; data->data_size = read_32bitBE(data->physical_offset+0x04,streamfile); /* also block_size - 0x08 */
if (bytes_read != to_read) break;
break; /* couldn't read fully */ #if 0
case 0x0c: /* EA Opus */
dest += bytes_read; data->skip_size = 0x08;
offset += bytes_read; data->data_size = data->block_size - data->skip_size;
length -= bytes_read; break;
#endif
/* block fully read, go next */ default:
if (intradata_offset + bytes_read == data_size) { return total_read;
data->physical_offset += block_size; }
data->logical_offset += data_size;
} }
if (data->version == 0 && (!data->streamed || block_flag == 0x80)) /* move to next block */
break; /* stop on last block */ if (offset >= data->logical_offset + data->data_size + data->extra_size) {
data->physical_offset += data->block_size;
data->logical_offset += data->data_size + data->extra_size;
data->data_size = 0;
data->extra_size = 0;
continue;
}
/* read data */
{
size_t bytes_consumed, bytes_done, to_read;
bytes_consumed = offset - data->logical_offset;
switch(data->codec) {
#if 0
case 0x03: { /* EA-XMA */
if (bytes_consumed < data->data_size) { /* offset falls within actual data */
to_read = data->data_size - bytes_consumed;
if (to_read > length)
to_read = length;
bytes_done = read_streamfile(dest, data->physical_offset + data->skip_size + bytes_consumed, to_read, streamfile);
}
else { /* offset falls within logical padded data */
to_read = data->data_size + data->extra_size - bytes_consumed;
if (to_read > length)
to_read = length;
memset(dest, 0xFF, to_read); /* no real need though, padding is ignored */
bytes_done = to_read;
}
break;
}
#endif
default:
to_read = data->data_size - bytes_consumed;
if (to_read > length)
to_read = length;
bytes_done = read_streamfile(dest, data->physical_offset + data->skip_size + bytes_consumed, to_read, streamfile);
break;
}
total_read += bytes_done;
dest += bytes_done;
offset += bytes_done;
length -= bytes_done;
if (bytes_done != to_read || bytes_done == 0) {
break; /* error/EOF */
}
}
} }
return total_read; return total_read;
} }
static size_t eaac_io_size(STREAMFILE *streamfile, eaac_io_data* data) { static size_t eaac_io_size(STREAMFILE *streamfile, eaac_io_data* data) {
off_t physical_offset, max_physical_offset; off_t physical_offset, max_physical_offset;
size_t total_size = 0; size_t logical_size = 0;
if (data->total_size) if (data->logical_size)
return data->total_size; return data->logical_size;
physical_offset = data->start_offset; physical_offset = data->stream_offset;
max_physical_offset = get_streamfile_size(streamfile); max_physical_offset = get_streamfile_size(streamfile);
/* get size of the underlying, non-blocked data */ /* get size of the logical stream */
while (physical_offset < max_physical_offset) { while (physical_offset < max_physical_offset) {
uint32_t block_flag, block_size, data_size; uint32_t block_flag, block_size, data_size, skip_size;
//int i;
block_flag = (uint8_t)read_8bit(physical_offset+0x00,streamfile); block_flag = (uint8_t)read_8bit(physical_offset+0x00,streamfile);
block_size = read_32bitBE(physical_offset+0x00,streamfile) & 0x00FFFFFF; block_size = read_32bitBE(physical_offset+0x00,streamfile) & 0x00FFFFFF;
if (data->version == 0 && block_flag != 0x00 && block_flag != 0x80) if (data->version == 0 && block_flag != 0x00 && block_flag != 0x80)
break; /* data/end block expected */ break; /* unknown block */
if (data->version == 1 && block_flag == 0x48) { if (data->version == 1 && block_flag == 0x48) {
physical_offset += block_size; physical_offset += block_size;
@ -145,13 +190,20 @@ static size_t eaac_io_size(STREAMFILE *streamfile, eaac_io_data* data) {
if (data->version == 1 && block_flag == 0x45) if (data->version == 1 && block_flag == 0x45)
break; /* stop on last block (always empty) */ break; /* stop on last block (always empty) */
if (data->version == 1 && block_flag != 0x44) if (data->version == 1 && block_flag != 0x44)
break; /* data block expected */ break; /* unknown block */
switch(data->codec) { switch(data->codec) {
#if 0 #if 0
case 0x03: case 0x03: /* EA-XMA */
data_size = block_size - ???; skip_size = 0x04 + 0x04;
data_size += (data_size % 0x800); /* deflated padding */ for (i = 0; i < data->stream_number - 1; i++) {
skip_size += read_32bitBE(physical_offset + skip_size, streamfile) / 4; /* why size*4...? */
}
data_size = read_32bitBE(physical_offset + skip_size, streamfile) / 4;
skip_size += 0x04; /* skip mini header */
data_size -= 0x04; /* remove mini header */
if (data_size % XMA_FRAME_SIZE)
data_size += XMA_FRAME_SIZE - (data_size % XMA_FRAME_SIZE); /* extra padding */
break; break;
#endif #endif
case 0x05: /* EALayer3 v1 */ case 0x05: /* EALayer3 v1 */
@ -161,46 +213,61 @@ static size_t eaac_io_size(STREAMFILE *streamfile, eaac_io_data* data) {
break; break;
case 0x0a: /* EATrax */ case 0x0a: /* EATrax */
data_size = read_32bitBE(physical_offset+0x04,streamfile); /* should be block_size - 0x08 */ data_size = read_32bitBE(physical_offset+0x04,streamfile); /* also block_size - 0x08 */
break; break;
#if 0
case 0x0c: { /* EAOpus */
size_t done;
data_size = 0;
while (done < block_size - 0x08) {
size_t packet_size = read_16bitBE(physical_offset+0x08+done,streamfile);
done += 0x02 + packet_size;
data_size = 0x1a + packet_size; /* OggS page per Opus packet */
}
break;
}
#endif
default: default:
return 0; return 0;
} }
physical_offset += block_size; physical_offset += block_size;
total_size += data_size; logical_size += data_size;
if (data->version == 0 && (!data->streamed || block_flag == 0x80)) if (data->version == 0 && (!data->streamed || block_flag == 0x80))
break; /* stop on last block */ break; /* stop on last block */
} }
if (total_size > get_streamfile_size(streamfile)) { data->logical_size = logical_size;
VGM_LOG("EA SCHL: wrong streamfile total_size\n"); return data->logical_size;
total_size = 0;
}
data->total_size = total_size;
return data->total_size;
} }
/* Prepares custom IO for some blocked EAAudioCore formats, that need clean reads without block headers: /* Prepares custom IO for some blocked EAAudioCore formats, that need clean reads without block headers:
* - EA-XMA: deflated XMA in multistreams (separate 2ch frames) * - EA-XMA: deflated XMA in multistreams (separate 1/2ch packets)
* - EALayer3: MPEG granule 1 can go in the next block (in V2"P" mainly, others could use layout blocked_sns) * - EALayer3: MPEG granule 1 can go in the next block (in V2"P" mainly, others could use layout blocked_sns)
* - EATrax: ATRAC9 frames can be split between blooks * - EATrax: ATRAC9 frames can be split between blooks
* - EAOpus:
*/ */
static STREAMFILE* setup_eaac_streamfile(STREAMFILE *streamFile, int version, int codec, int streamed, off_t start_offset, size_t total_size) { static STREAMFILE* setup_eaac_streamfile(STREAMFILE *streamFile, int version, int codec, int streamed, int stream_number, int stream_count, off_t stream_offset) {
STREAMFILE *temp_streamFile = NULL, *new_streamFile = NULL; STREAMFILE *temp_streamFile = NULL, *new_streamFile = NULL;
eaac_io_data io_data = {0}; eaac_io_data io_data = {0};
size_t io_data_size = sizeof(eaac_io_data); size_t io_data_size = sizeof(eaac_io_data);
io_data.version = version; io_data.version = version;
io_data.codec = codec; io_data.codec = codec;
io_data.start_offset = start_offset;
io_data.streamed = streamed; io_data.streamed = streamed;
io_data.total_size = total_size; /* optional */ io_data.stream_number = stream_number;
io_data.physical_offset = start_offset; io_data.stream_count = stream_count;
io_data.stream_offset = stream_offset;
io_data.physical_offset = stream_offset;
io_data.logical_size = eaac_io_size(streamFile, &io_data); /* force init */
if (io_data.logical_size > get_streamfile_size(streamFile)) {
VGM_LOG("EA EAAC: wrong logical size\n");
goto fail;
}
/* setup subfile */ /* setup subfile */
new_streamFile = open_wrap_streamfile(streamFile); new_streamFile = open_wrap_streamfile(streamFile);