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

cli: minor tweaks

Browse Source
This commit is contained in:
bnnm 2025-01-22 01:46:31 +01:00
parent 08971a05fb
commit 4ad40660db
3 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
cli/vgmstream_cli.c
View File

@ -65,7 +65,7 @@ static void print_usage(const char* progname, bool is_help) {
" -P: output to stdout even if stdout is a terminal\n" " -P: output to stdout even if stdout is a terminal\n"
" -c: loop forever (continuously) to stdout\n" " -c: loop forever (continuously) to stdout\n"
" -L: append a smpl chunk and create a looping wav\n" " -L: append a smpl chunk and create a looping wav\n"
//" -w: allow .wav in original sample format rather than downmixing to PCM16\n" //" -w: allow .wav in original sample format rather than mixing to PCM16\n"
" -V: print version info and supported extensions as JSON\n" " -V: print version info and supported extensions as JSON\n"
" -I: print requested file info as JSON\n" " -I: print requested file info as JSON\n"
" -h: print all commands\n" " -h: print all commands\n"
@ -89,6 +89,7 @@ static void print_usage(const char* progname, bool is_help) {
" -T: print title (for title testing)\n" " -T: print title (for title testing)\n"
" -D <max channels>: downmix to <max channels> (for plugin downmix testing)\n" " -D <max channels>: downmix to <max channels> (for plugin downmix testing)\n"
" -B <samples> force a sample buffer size (for api testing)\n" " -B <samples> force a sample buffer size (for api testing)\n"
//" -W: force .wav to output in float sample format\n"
" -O: decode but don't write to file (for performance testing)\n" " -O: decode but don't write to file (for performance testing)\n"
); );
@ -108,7 +109,7 @@ static bool parse_config(cli_config_t* cfg, int argc, char** argv) {
optind = 1; /* reset getopt's ugly globals (needed in wasm that may call same main() multiple times) */ optind = 1; /* reset getopt's ugly globals (needed in wasm that may call same main() multiple times) */
/* read config */ /* read config */
while ((opt = getopt(argc, argv, "o:l:f:d:ipPcmxeLEFrgb2:s:tTk:K:hOvD:S:B:VI")) != -1) { while ((opt = getopt(argc, argv, "o:l:f:d:ipPcmxeLEFrgb2:s:tTk:K:hOvD:S:B:VIwW")) != -1) {
switch (opt) { switch (opt) {
case 'o': case 'o':
cfg->outfilename = optarg; cfg->outfilename = optarg;
@ -216,6 +217,9 @@ static bool parse_config(cli_config_t* cfg, int argc, char** argv) {
goto fail; goto fail;
} }
break; break;
case 'W':
cfg->write_float_wav = true;
break;
case '2': case '2':
cfg->stereo_track = atoi(optarg) + 1; cfg->stereo_track = atoi(optarg) + 1;
break; break;
@ -330,29 +334,23 @@ static void apply_config(VGMSTREAM* vgmstream, cli_config_t* cfg) {
static bool write_file(VGMSTREAM* vgmstream, cli_config_t* cfg) { static bool write_file(VGMSTREAM* vgmstream, cli_config_t* cfg) {
FILE* outfile = NULL; FILE* outfile = NULL;
int32_t len_samples;
sample_t* buf = NULL;
int channels, input_channels;
int channels = vgmstream->channels;
channels = vgmstream->channels; int input_channels = vgmstream->channels;
input_channels = vgmstream->channels;
vgmstream_mixing_enable(vgmstream, 0, &input_channels, &channels); vgmstream_mixing_enable(vgmstream, 0, &input_channels, &channels);
sample_t* buf = malloc(cfg->sample_buffer_size * sizeof(sample_t) * input_channels);
/* last init */
buf = malloc(cfg->sample_buffer_size * sizeof(sample_t) * input_channels);
if (!buf) { if (!buf) {
fprintf(stderr, "failed allocating output buffer\n"); fprintf(stderr, "failed allocating output buffer\n");
goto fail; return false;
} }
/* simulate seek */ /* simulate seek */
len_samples = vgmstream_get_samples(vgmstream); int32_t play_samples = vgmstream_get_samples(vgmstream);
if (cfg->seek_samples2 >= 0) if (cfg->seek_samples2 >= 0)
len_samples -= cfg->seek_samples2; play_samples -= cfg->seek_samples2;
else if (cfg->seek_samples1 >= 0) else if (cfg->seek_samples1 >= 0)
len_samples -= cfg->seek_samples1; play_samples -= cfg->seek_samples1;
if (cfg->seek_samples1 >= 0) if (cfg->seek_samples1 >= 0)
seek_vgmstream(vgmstream, cfg->seek_samples1); seek_vgmstream(vgmstream, cfg->seek_samples1);
@ -385,7 +383,7 @@ static bool write_file(VGMSTREAM* vgmstream, cli_config_t* cfg) {
size_t bytes_done; size_t bytes_done;
wav_header_t wav = { wav_header_t wav = {
.sample_count = len_samples, .sample_count = play_samples,
.sample_rate = vgmstream->sample_rate, .sample_rate = vgmstream->sample_rate,
.channels = channels, .channels = channels,
.write_smpl_chunk = cfg->write_lwav, .write_smpl_chunk = cfg->write_lwav,
@ -394,31 +392,39 @@ static bool write_file(VGMSTREAM* vgmstream, cli_config_t* cfg) {
}; };
bytes_done = wav_make_header(wav_buf, 0x100, &wav); bytes_done = wav_make_header(wav_buf, 0x100, &wav);
if (bytes_done == 0) goto fail;
fwrite(wav_buf, sizeof(uint8_t), bytes_done, outfile); fwrite(wav_buf, sizeof(uint8_t), bytes_done, outfile);
} }
/* decode forever */ /* decode forever */// TODO improve logic of play forever + normal play
while (cfg->play_forever && !cfg->decode_only) { while (cfg->play_forever && !cfg->decode_only) {
int to_get = cfg->sample_buffer_size; int to_get = cfg->sample_buffer_size;
render_vgmstream(buf, to_get, vgmstream); render_vgmstream(buf, to_get, vgmstream);
wav_swap_samples_le(buf, channels * to_get, 0); int buf_bytes = to_get * channels * sizeof(sample_t);
fwrite(buf, sizeof(sample_t), to_get * channels, outfile); int buf_samples = to_get;
int sample_size = 0;
wav_swap_samples_le(buf, channels * buf_samples, sample_size);
fwrite(buf, sizeof(uint8_t), buf_bytes, outfile);
/* should write infinitely until program kill */ /* should write infinitely until program kill */
} }
/* decode */ /* decode */
for (int i = 0; i < len_samples; i += cfg->sample_buffer_size) { for (int i = 0; i < play_samples; i += cfg->sample_buffer_size) {
int to_get = cfg->sample_buffer_size; int to_get = cfg->sample_buffer_size;
if (i + cfg->sample_buffer_size > len_samples) if (i + cfg->sample_buffer_size > play_samples)
to_get = len_samples - i; to_get = play_samples - i;
render_vgmstream(buf, to_get, vgmstream); render_vgmstream(buf, to_get, vgmstream);
int buf_bytes = to_get * channels * sizeof(sample_t);
int buf_samples = to_get;
int sample_size = 0;
if (!cfg->decode_only) { if (!cfg->decode_only) {
wav_swap_samples_le(buf, channels * to_get, 0); wav_swap_samples_le(buf, channels * buf_samples, sample_size);
fwrite(buf, sizeof(sample_t), to_get * channels, outfile); fwrite(buf, sizeof(uint8_t), buf_bytes, outfile);
} }
} }
@ -490,7 +496,7 @@ fail:
static bool convert_file(cli_config_t* cfg) { static bool convert_file(cli_config_t* cfg) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
char outfilename_temp[CLI_PATH_LIMIT]; char outfilename_temp[CLI_PATH_LIMIT];
int32_t len_samples; int32_t play_samples;
/* for plugin testing */ /* for plugin testing */
@ -510,8 +516,8 @@ static bool convert_file(cli_config_t* cfg) {
/* get final play config */ /* get final play config */
len_samples = vgmstream_get_samples(vgmstream); play_samples = vgmstream_get_samples(vgmstream);
if (len_samples <= 0) { if (play_samples <= 0) {
fprintf(stderr, "wrong time config\n"); fprintf(stderr, "wrong time config\n");
goto fail; goto fail;
} }
@ -525,7 +531,7 @@ static bool convert_file(cli_config_t* cfg) {
} }
/* would be ignored by seek code though (allowed for seek_samples2 to test this) */ /* would be ignored by seek code though (allowed for seek_samples2 to test this) */
if (cfg->seek_samples1 < -1 || cfg->seek_samples1 >= len_samples) { if (cfg->seek_samples1 < -1 || cfg->seek_samples1 >= play_samples) {
fprintf(stderr, "wrong seek config\n"); fprintf(stderr, "wrong seek config\n");
goto fail; goto fail;
} }

1
cli/vgmstream_cli.h
View File

@ -36,6 +36,7 @@ typedef struct {
// wav config // wav config
bool write_lwav; bool write_lwav;
bool write_original_wav; bool write_original_wav;
bool write_float_wav;
// print flags // print flags
bool print_metaonly; bool print_metaonly;

15
cli/vgmstream_cli_utils.c
View File

@ -1,14 +1,11 @@
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include "vgmstream_cli.h" #include "vgmstream_cli.h"
#include "vjson.h"
#include "../src/api.h" #include "../src/api.h"
#include "../src/vgmstream.h" #include "../src/vgmstream.h"
#include "vjson.h"
static void clean_filename(char* dst, int clean_paths) { static void clean_filename(char* dst, int clean_paths) {
for (int i = 0; i < strlen(dst); i++) { for (int i = 0; i < strlen(dst); i++) {
char c = dst[i]; char c = dst[i];
@ -79,7 +76,7 @@ void replace_filename(char* dst, size_t dstsize, cli_config_t* cfg, VGMSTREAM* v
} }
else { else {
/* not recognized */ /* not recognized */
// TO-DO should move buf or swap "?" with "_"? may happen with non-ascii on Windows; for now break to avoid infinite loops // TO-DO: should move buf or swap "?" with "_"? may happen with non-ascii on Windows; for now break to avoid infinite loops
break; break;
} }
@ -101,8 +98,8 @@ void replace_filename(char* dst, size_t dstsize, cli_config_t* cfg, VGMSTREAM* v
void print_info(VGMSTREAM* vgmstream, cli_config_t* cfg) { void print_info(VGMSTREAM* vgmstream, cli_config_t* cfg) {
int channels = vgmstream->channels; int channels = vgmstream->channels;
int64_t num_samples = vgmstream->num_samples;
bool loop_flag = vgmstream->loop_flag; bool loop_flag = vgmstream->loop_flag;
int64_t num_samples = vgmstream->num_samples;
int64_t loop_start = vgmstream->loop_start_sample; int64_t loop_start = vgmstream->loop_start_sample;
int64_t loop_end = vgmstream->loop_start_sample; int64_t loop_end = vgmstream->loop_start_sample;
@ -180,9 +177,9 @@ void print_title(VGMSTREAM* vgmstream, cli_config_t* cfg) {
if (!cfg->print_title) if (!cfg->print_title)
return; return;
tcfg.force_title = 0; tcfg.force_title = false;
tcfg.subsong_range = 0; tcfg.subsong_range = false;
tcfg.remove_extension = 0; tcfg.remove_extension = true;
vgmstream_get_title(title, sizeof(title), cfg->infilename, vgmstream, &tcfg); vgmstream_get_title(title, sizeof(title), cfg->infilename, vgmstream, &tcfg);