Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-17 23:36:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean ACM init/free/reset

Browse Source
This commit is contained in:
bnnm 2018-03-16 15:42:01 +01:00
parent 8d4974033c
commit ce9a69aad1
4 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/coding/acm_decoder.c
View File

@ -817,23 +817,76 @@ void acm_reset(ACMStream *acm)
memset(acm->wrapbuf, 0, acm->wrapbuf_len * sizeof(int));
}
/* interface to vgmstream */
void decode_acm(ACMStream * acm, sample * outbuf,
int32_t samples_to_do, int channelspacing) {
/***********************************************
* interface to vgmstream
***********************************************/
mus_acm_codec_data *init_acm(int files) {
mus_acm_codec_data* data = NULL;
if (files == 0)
goto fail;
data = calloc(1,sizeof(mus_acm_codec_data));
if (!data) goto fail;
data->files = calloc(files,sizeof(ACMStream *));
if (!data->files) goto fail;
data->file_count = files;
data->current_file = 0;
return data;
fail:
free_acm(data);
return NULL;
}
void decode_acm(ACMStream * acm, sample * outbuf, int32_t samples_to_do, int channelspacing) {
int32_t samples_read = 0;
while (samples_read < samples_to_do) {
int32_t bytes_read_just_now;
bytes_read_just_now =
acm_read(acm,(char*)(
outbuf+samples_read*channelspacing),
(samples_to_do-samples_read)*sizeof(sample)*
channelspacing,0,2,1);
int32_t bytes_read_just_now = acm_read(
acm,
(char*)(outbuf+samples_read*channelspacing),
(samples_to_do-samples_read)*sizeof(sample)*channelspacing,
0,2,1);
if (bytes_read_just_now > 0) {
samples_read +=
bytes_read_just_now/sizeof(sample)/channelspacing;
samples_read += bytes_read_just_now/sizeof(sample)/channelspacing;
} else {
return;
}
}
}
void reset_acm(VGMSTREAM *vgmstream) {
mus_acm_codec_data *data = vgmstream->codec_data;
int i;
if (data) {
data->current_file = 0;
for (i=0;i<data->file_count;i++) {
acm_reset(data->files[i]);
}
}
}
void free_acm(mus_acm_codec_data *data) {
if (data) {
if (data->files) {
int i;
for (i = 0; i < data->file_count; i++) {
/* shouldn't be duplicates */
if (data->files[i]) {
acm_close(data->files[i]);
}
}
free(data->files);
}
free(data);
}
}

3
src/coding/coding.h
View File

@ -102,7 +102,10 @@ void decode_cbd2_int(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspac
void decode_ws(VGMSTREAM * vgmstream, int channel, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do);
/* acm_decoder */
mus_acm_codec_data *init_acm(int files);
void decode_acm(ACMStream * acm, sample * outbuf, int32_t samples_to_do, int channelspacing);
void reset_acm(VGMSTREAM *vgmstream);
void free_acm(mus_acm_codec_data *data);
/* nwa_decoder */
void decode_nwa(NWAData *nwa, sample *outbuf, int32_t samples_to_do);

26
src/meta/acm.c
View File

@ -1,10 +1,8 @@
#include "../vgmstream.h"
#include "meta.h"
#include "../util.h"
#include "../coding/coding.h"
#include "../coding/acm_decoder.h"
/* InterPlay ACM */
/* The real work is done by libacm */
/* ACM - InterPlay infinity engine games [Planescape: Torment (PC), Baldur's Gate (PC)] */
VGMSTREAM * init_vgmstream_acm(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
int loop_flag = 0, channel_count, sample_rate, num_samples;
@ -19,16 +17,9 @@ VGMSTREAM * init_vgmstream_acm(STREAMFILE *streamFile) {
/* init decoder */
{
data = calloc(1,sizeof(mus_acm_codec_data));
data = init_acm(1);
if (!data) goto fail;
data->current_file = 0;
data->file_count = 1;
data->files = calloc(data->file_count,sizeof(ACMStream *));
if (!data->files) goto fail;
}
/* open and parse the file before creating the vgmstream */
{
ACMStream *acm_stream = NULL;
@ -62,16 +53,7 @@ VGMSTREAM * init_vgmstream_acm(STREAMFILE *streamFile) {
return vgmstream;
fail:
if (data && (!vgmstream || !vgmstream->codec_data)) {
if (data) {
int i;
for (i = 0; i < data->file_count; i++) {
acm_close(data->files[i]);
}
free(data->files);
free(data);
}
}
free_acm(data);
close_vgmstream(vgmstream);
return NULL;
}

30
src/vgmstream.c
View File

@ -571,14 +571,7 @@ void reset_vgmstream(VGMSTREAM * vgmstream) {
#endif
if (vgmstream->coding_type==coding_ACM) {
mus_acm_codec_data *data = vgmstream->codec_data;
int i;
if (data) {
data->current_file = 0;
for (i=0;i<data->file_count;i++) {
acm_reset(data->files[i]);
}
}
reset_acm(vgmstream);
}
if (
@ -764,26 +757,9 @@ void close_vgmstream(VGMSTREAM * vgmstream) {
#endif
if (vgmstream->coding_type==coding_ACM) {
mus_acm_codec_data *data = (mus_acm_codec_data *) vgmstream->codec_data;
if (data) {
if (data->files) {
int i;
for (i=0; i<data->file_count; i++) {
/* shouldn't be duplicates */
if (data->files[i]) {
acm_close(data->files[i]);
data->files[i] = NULL;
}
}
free(data->files);
data->files = NULL;
}
free(vgmstream->codec_data);
free_acm(vgmstream->codec_data);
vgmstream->codec_data = NULL;
}
}
if (
vgmstream->coding_type == coding_NWA0 ||
@ -1818,7 +1794,7 @@ void decode_vgmstream(VGMSTREAM * vgmstream, int samples_written, int samples_to
vgmstream->channels);
break;
#endif
case coding_ACM: {
case coding_ACM: { //single ACM
mus_acm_codec_data *data = vgmstream->codec_data;
ACMStream *acm;