Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-07 07:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow layers of more than 1 channel

Browse Source
This commit is contained in:
bnnm 2018-04-22 02:19:37 +02:00
parent f45b08586d
commit 7a212eed9b
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/layout/layered.c
View File

@ -1,36 +1,44 @@
#include "layout.h" #include "layout.h"
#include "../vgmstream.h" #include "../vgmstream.h"
/* TODO: currently only properly handles mono substreams */
/* TODO: there must be a reasonable way to respect the loop settings, as /* TODO: there must be a reasonable way to respect the loop settings, as
the substreams are in their own little world. the substreams are in their own little world.
Currently the VGMSTREAMs layers loop internally and the external/base VGMSTREAM Currently the VGMSTREAMs layers loop internally and the external/base VGMSTREAM
doesn't actually loop, and would ignore any altered values/loop_flag. */ doesn't actually loop, and would ignore any altered values/loop_flag. */
#define INTERLEAVE_BUF_SIZE 512 #define LAYER_BUF_SIZE 512
#define LAYER_MAX_CHANNELS 6 /* at least 2, but let's be generous */
void render_vgmstream_layered(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream) { void render_vgmstream_layered(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstream) {
sample interleave_buf[INTERLEAVE_BUF_SIZE]; sample interleave_buf[LAYER_BUF_SIZE*LAYER_MAX_CHANNELS];
int32_t samples_done = 0; int32_t samples_done = 0;
layered_layout_data *data = vgmstream->layout_data; layered_layout_data *data = vgmstream->layout_data;
while (samples_done < sample_count) { while (samples_done < sample_count) {
int32_t samples_to_do = INTERLEAVE_BUF_SIZE; int32_t samples_to_do = LAYER_BUF_SIZE;
int c; int layer;
if (samples_to_do > sample_count - samples_done) if (samples_to_do > sample_count - samples_done)
samples_to_do = sample_count - samples_done; samples_to_do = sample_count - samples_done;
for (c=0; c < data->layer_count; c++) { for (layer = 0; layer < data->layer_count; layer++) {
int32_t i; int s,l_ch;
int layer_channels = data->layers[layer]->channels;
render_vgmstream(interleave_buf, samples_to_do, data->layers[c]); render_vgmstream(interleave_buf, samples_to_do, data->layers[layer]);
for (i=0; i < samples_to_do; i++) { for (l_ch = 0; l_ch < layer_channels; l_ch++) {
buffer[(samples_done+i)*data->layer_count + c] = interleave_buf[i]; for (s = 0; s < samples_to_do; s++) {
size_t layer_sample = s*layer_channels + l_ch;
size_t buffer_sample = (samples_done+s)*vgmstream->channels + (layer*layer_channels+l_ch);
buffer[buffer_sample] = interleave_buf[layer_sample];
} }
} }
}
samples_done += samples_to_do; samples_done += samples_to_do;
} }
} }
@ -67,8 +75,7 @@ int setup_layout_layered(layered_layout_data* data) {
if (data->layers[i]->num_samples <= 0) if (data->layers[i]->num_samples <= 0)
goto fail; goto fail;
//todo only mono at the moment if (data->layers[i]->channels > LAYER_MAX_CHANNELS)
if (data->layers[i]->channels != 1)
goto fail; goto fail;
if (i > 0) { if (i > 0) {