From cad2f6832c46952ec2bf05785861adb9fd14dfcb Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 6 Nov 2020 15:53:21 -0500 Subject: Replace pcm.py with pcm.c, removing the dependency on Python --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index 13bab1fb..ca99b118 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,7 @@ CC := gcc CFLAGS := -O3 -std=c99 -Wall -Wextra -tools := scan_includes gfx pkmncompress +tools := scan_includes gfx pkmncompress pcm all: $(tools) @: -- cgit v1.3.1-sl0p From c470dc22788259639bf37a7c92f995b19f1a19b0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 6 Nov 2020 16:24:05 -0500 Subject: 'make tools' uses -pedantic --- tools/Makefile | 2 +- tools/pcm.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index ca99b118..f8dceb1a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean CC := gcc -CFLAGS := -O3 -std=c99 -Wall -Wextra +CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic tools := scan_includes gfx pkmncompress pcm diff --git a/tools/pcm.c b/tools/pcm.c index 82f66965..a14e291d 100644 --- a/tools/pcm.c +++ b/tools/pcm.c @@ -52,28 +52,26 @@ uint8_t *wav2pcm(uint8_t *wavdata, size_t wavsize, size_t *pcmsize) { return NULL; } + // require 22050 Hz 8-bit PCM WAV audio if (chunkid == CHUNKID('f', 'm', 't', ' ')) { int32_t audio_format = get_uint16le(wavdata, wavsize, i); if (audio_format != 1) { fputs("WAV data is not PCM format\n", stderr); return NULL; } - int32_t num_channels = get_uint16le(wavdata, wavsize, i+2); if (num_channels != 1) { fputs("WAV data is not mono\n", stderr); return NULL; } - int64_t sample_rate = get_uint32le(wavdata, wavsize, i+4); if (sample_rate != 22050) { fputs("WAV data is not 22050 Hz\n", stderr); return NULL; } - int32_t bits_per_sample = get_uint16le(wavdata, wavsize, i+14); if (bits_per_sample != 8) { - fputs("WAV data is not 8-bit samples\n", stderr); + fputs("WAV data is not 8-bit\n", stderr); return NULL; } } @@ -106,8 +104,7 @@ uint8_t *wav2pcm(uint8_t *wavdata, size_t wavsize, size_t *pcmsize) { return pcmdata; } -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { if (argc != 3) { fprintf(stderr, "Usage: %s infile.wav outfile.pcm\n", argv[0]); return EXIT_FAILURE; -- cgit v1.3.1-sl0p