diff options
Diffstat (limited to 'src/lib/util/wavwrite.cpp')
-rw-r--r-- | src/lib/util/wavwrite.cpp | 224 |
1 files changed, 114 insertions, 110 deletions
diff --git a/src/lib/util/wavwrite.cpp b/src/lib/util/wavwrite.cpp index 0667e9dcaff..ecb5514b48f 100644 --- a/src/lib/util/wavwrite.cpp +++ b/src/lib/util/wavwrite.cpp @@ -1,88 +1,92 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles +#include "wavwrite.h" + #include "osdcomm.h" -#include "corealloc.h" + +#include <cstdio> +#include <new> +#include <string> #include <vector> -#include "wavwrite.h" + + +namespace util { struct wav_file { - FILE *file; - uint32_t total_offs; - uint32_t data_offs; + FILE *file = nullptr; + std::vector<std::int16_t> temp; + std::uint32_t total_offs = 0U; + std::uint32_t data_offs = 0U; }; -wav_file *wav_open(const char *filename, int sample_rate, int channels) +wav_file_ptr wav_open(std::string_view filename, int sample_rate, int channels) { - wav_file *wav; - uint32_t bps, temp32; - uint16_t align, temp16; + std::uint32_t temp32; + std::uint16_t temp16; - /* allocate memory for the wav struct */ - wav = global_alloc_nothrow(wav_file); + // allocate memory for the wav struct + wav_file_ptr wav(new (std::nothrow) wav_file); if (!wav) return nullptr; - /* create the file */ - wav->file = fopen(filename, "wb"); + // create the file + wav->file = std::fopen(std::string(filename).c_str(), "wb"); // ugly - need to force NUL termination on filename if (!wav->file) - { - global_free(wav); return nullptr; - } - /* write the 'RIFF' header */ - fwrite("RIFF", 1, 4, wav->file); + // write the 'RIFF' header + std::fwrite("RIFF", 1, 4, wav->file); - /* write the total size */ + // write the total size temp32 = 0; - wav->total_offs = ftell(wav->file); - fwrite(&temp32, 1, 4, wav->file); + wav->total_offs = std::ftell(wav->file); + std::fwrite(&temp32, 1, 4, wav->file); - /* write the 'WAVE' type */ - fwrite("WAVE", 1, 4, wav->file); + // write the 'WAVE' type + std::fwrite("WAVE", 1, 4, wav->file); - /* write the 'fmt ' tag */ - fwrite("fmt ", 1, 4, wav->file); + // write the 'fmt ' tag + std::fwrite("fmt ", 1, 4, wav->file); - /* write the format length */ + // write the format length temp32 = little_endianize_int32(16); - fwrite(&temp32, 1, 4, wav->file); + std::fwrite(&temp32, 1, 4, wav->file); - /* write the format (PCM) */ + // write the format (PCM) temp16 = little_endianize_int16(1); - fwrite(&temp16, 1, 2, wav->file); + std::fwrite(&temp16, 1, 2, wav->file); - /* write the channels */ + // write the channels temp16 = little_endianize_int16(channels); - fwrite(&temp16, 1, 2, wav->file); + std::fwrite(&temp16, 1, 2, wav->file); - /* write the sample rate */ + // write the sample rate temp32 = little_endianize_int32(sample_rate); - fwrite(&temp32, 1, 4, wav->file); + std::fwrite(&temp32, 1, 4, wav->file); - /* write the bytes/second */ - bps = sample_rate * 2 * channels; + // write the bytes/second + std::uint32_t const bps = sample_rate * 2 * channels; temp32 = little_endianize_int32(bps); - fwrite(&temp32, 1, 4, wav->file); + std::fwrite(&temp32, 1, 4, wav->file); - /* write the block align */ - align = 2 * channels; + // write the block align + std::uint16_t const align = 2 * channels; temp16 = little_endianize_int16(align); - fwrite(&temp16, 1, 2, wav->file); + std::fwrite(&temp16, 1, 2, wav->file); - /* write the bits/sample */ + // write the bits/sample temp16 = little_endianize_int16(16); - fwrite(&temp16, 1, 2, wav->file); + std::fwrite(&temp16, 1, 2, wav->file); - /* write the 'data' tag */ - fwrite("data", 1, 4, wav->file); + // write the 'data' tag + std::fwrite("data", 1, 4, wav->file); - /* write the data length */ + // write the data length temp32 = 0; - wav->data_offs = ftell(wav->file); - fwrite(&temp32, 1, 4, wav->file); + wav->data_offs = std::ftell(wav->file); + std::fwrite(&temp32, 1, 4, wav->file); return wav; } @@ -90,102 +94,102 @@ wav_file *wav_open(const char *filename, int sample_rate, int channels) void wav_close(wav_file *wav) { - uint32_t total; - uint32_t temp32; - - if (!wav) return; - - total = ftell(wav->file); - - /* update the total file size */ - fseek(wav->file, wav->total_offs, SEEK_SET); - temp32 = total - (wav->total_offs + 4); - temp32 = little_endianize_int32(temp32); - fwrite(&temp32, 1, 4, wav->file); + if (!wav) + return; - /* update the data size */ - fseek(wav->file, wav->data_offs, SEEK_SET); - temp32 = total - (wav->data_offs + 4); - temp32 = little_endianize_int32(temp32); - fwrite(&temp32, 1, 4, wav->file); + if (wav->file) + { + std::uint32_t temp32; + std::uint32_t const total = std::ftell(wav->file); + + // update the total file size + std::fseek(wav->file, wav->total_offs, SEEK_SET); + temp32 = total - (wav->total_offs + 4); + temp32 = little_endianize_int32(temp32); + std::fwrite(&temp32, 1, 4, wav->file); + + // update the data size + std::fseek(wav->file, wav->data_offs, SEEK_SET); + temp32 = total - (wav->data_offs + 4); + temp32 = little_endianize_int32(temp32); + std::fwrite(&temp32, 1, 4, wav->file); + + std::fclose(wav->file); + } - fclose(wav->file); - global_free(wav); + delete wav; } -void wav_add_data_16(wav_file *wav, int16_t *data, int samples) +void wav_add_data_16(wav_file &wav, int16_t *data, int samples) { - if (!wav) return; - - /* just write and flush the data */ - fwrite(data, 2, samples, wav->file); - fflush(wav->file); + // just write and flush the data + std::fwrite(data, 2, samples, wav.file); + std::fflush(wav.file); } -void wav_add_data_32(wav_file *wav, int32_t *data, int samples, int shift) +void wav_add_data_32(wav_file &wav, int32_t *data, int samples, int shift) { - std::vector<int16_t> temp; - int i; + if (!samples) + return; - if (!wav || !samples) return; + // resize dynamic array - don't want it to copy if it needs to expand + wav.temp.clear(); + wav.temp.resize(samples); - /* resize dynamic array */ - temp.resize(samples); - - /* clamp */ - for (i = 0; i < samples; i++) + // clamp + for (int i = 0; i < samples; i++) { int val = data[i] >> shift; - temp[i] = (val < -32768) ? -32768 : (val > 32767) ? 32767 : val; + wav.temp[i] = (val < -32768) ? -32768 : (val > 32767) ? 32767 : val; } - /* write and flush */ - fwrite(&temp[0], 2, samples, wav->file); - fflush(wav->file); + // write and flush + std::fwrite(&wav.temp[0], 2, samples, wav.file); + std::fflush(wav.file); } -void wav_add_data_16lr(wav_file *wav, int16_t *left, int16_t *right, int samples) +void wav_add_data_16lr(wav_file &wav, int16_t *left, int16_t *right, int samples) { - std::vector<int16_t> temp; - int i; - - if (!wav || !samples) return; + if (!samples) + return; - /* resize dynamic array */ - temp.resize(samples * 2); + // resize dynamic array - don't want it to copy if it needs to expand + wav.temp.clear(); + wav.temp.resize(samples * 2); - /* interleave */ - for (i = 0; i < samples * 2; i++) - temp[i] = (i & 1) ? right[i / 2] : left[i / 2]; + // interleave + for (int i = 0; i < samples * 2; i++) + wav.temp[i] = (i & 1) ? right[i / 2] : left[i / 2]; - /* write and flush */ - fwrite(&temp[0], 4, samples, wav->file); - fflush(wav->file); + // write and flush + std::fwrite(&wav.temp[0], 4, samples, wav.file); + std::fflush(wav.file); } -void wav_add_data_32lr(wav_file *wav, int32_t *left, int32_t *right, int samples, int shift) +void wav_add_data_32lr(wav_file &wav, int32_t *left, int32_t *right, int samples, int shift) { - std::vector<int16_t> temp; - int i; + if (!samples) + return; - if (!wav || !samples) return; + // resize dynamic array - don't want it to copy if it needs to expand + wav.temp.clear(); + wav.temp.resize(samples * 2); - /* resize dynamic array */ - temp.resize(samples); - - /* interleave */ - for (i = 0; i < samples * 2; i++) + // interleave + for (int i = 0; i < samples * 2; i++) { int val = (i & 1) ? right[i / 2] : left[i / 2]; val >>= shift; - temp[i] = (val < -32768) ? -32768 : (val > 32767) ? 32767 : val; + wav.temp[i] = (val < -32768) ? -32768 : (val > 32767) ? 32767 : val; } - /* write and flush */ - fwrite(&temp[0], 4, samples, wav->file); - fflush(wav->file); + // write and flush + std::fwrite(&wav.temp[0], 4, samples, wav.file); + std::fflush(wav.file); } + +} // namespace util |