sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfizz_render without sndfile

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-23 13:28:07 +01:00
parent 5610c2ec90
commit b0e4fb316a
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/CMakeLists.txt
View file

@ -8,7 +8,7 @@ endif()
if(SFIZZ_RENDER) if(SFIZZ_RENDER)
add_executable(sfizz_render MidiHelpers.h sfizz_render.cpp) add_executable(sfizz_render MidiHelpers.h sfizz_render.cpp)
target_link_libraries(sfizz_render PRIVATE sfizz::internal sfizz::fmidi sfizz::sndfile sfizz::cxxopts) target_link_libraries(sfizz_render PRIVATE sfizz::internal sfizz::fmidi sfizz::cxxopts st_audiofile_formats)
sfizz_enable_lto_if_needed(sfizz_render) sfizz_enable_lto_if_needed(sfizz_render)
install(TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "render" OPTIONAL) install(TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "render" OPTIONAL)
endif() endif()

31
clients/sfizz_render.cpp
View file

@ -1,11 +1,11 @@
#include <sndfile.hh>
#include "sfizz/Synth.h" #include "sfizz/Synth.h"
#include "sfizz/MathHelpers.h" #include "sfizz/MathHelpers.h"
#include "sfizz/SfzHelpers.h" #include "sfizz/SfzHelpers.h"
#include "sfizz/SIMDHelpers.h" #include "sfizz/SIMDHelpers.h"
#include "MidiHelpers.h" #include "MidiHelpers.h"
#include "cxxopts.hpp" #include <st_audiofile_libs.h>
#include <cxxopts.hpp>
#include <fmidi/fmidi.h> #include <fmidi/fmidi.h>
#include <iostream> #include <iostream>
@ -158,14 +158,27 @@ int main(int argc, char** argv)
LOG_INFO("-- Cutting the rendering at the last MIDI End of Track message"); LOG_INFO("-- Cutting the rendering at the last MIDI End of Track message");
} }
SndfileHandle outputFile (outputPath.u8string(), SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 2, sampleRate); drwav outputFile;
ERROR_IF(outputFile.error() != 0, "Error writing out the wav file: " << outputFile.strError()); drwav_data_format outputFormat {};
outputFormat.container = drwav_container_riff;
outputFormat.format = DR_WAVE_FORMAT_PCM;
outputFormat.channels = 2;
outputFormat.sampleRate = sampleRate;
outputFormat.bitsPerSample = 16;
#if !defined(_WIN32)
drwav_bool32 outputFileOk = drwav_init_file_write(&outputFile, outputPath.c_str(), &outputFormat, nullptr);
#else
drwav_bool32 outputFileOk = drwav_init_file_write_w(&outputFile, outputPath.c_str(), &outputFormat, nullptr);
#endif
ERROR_IF(!outputFileOk, "Error opening the wav file for writing");
auto sampleRateDouble = static_cast<double>(sampleRate); auto sampleRateDouble = static_cast<double>(sampleRate);
const double increment { 1.0 / sampleRateDouble }; const double increment { 1.0 / sampleRateDouble };
int numFramesWritten { 0 }; uint64_t numFramesWritten { 0 };
sfz::AudioBuffer<float> audioBuffer { 2, blockSize }; sfz::AudioBuffer<float> audioBuffer { 2, blockSize };
sfz::Buffer<float> interleavedBuffer { 2 * blockSize }; sfz::Buffer<float> interleavedBuffer { 2 * blockSize };
sfz::Buffer<int16_t> interleavedPcm { 2 * blockSize };
fmidi_player_u midiPlayer { fmidi_player_new(midiFile.get()) }; fmidi_player_u midiPlayer { fmidi_player_new(midiFile.get()) };
CallbackData callbackData { synth, 0, false }; CallbackData callbackData { synth, 0, false };
@ -178,7 +191,8 @@ int main(int argc, char** argv)
fmidi_player_tick(midiPlayer.get(), increment); fmidi_player_tick(midiPlayer.get(), increment);
synth.renderBlock(audioBuffer); synth.renderBlock(audioBuffer);
sfz::writeInterleaved(audioBuffer.getConstSpan(0), audioBuffer.getConstSpan(1), absl::MakeSpan(interleavedBuffer)); sfz::writeInterleaved(audioBuffer.getConstSpan(0), audioBuffer.getConstSpan(1), absl::MakeSpan(interleavedBuffer));
numFramesWritten += outputFile.writef(interleavedBuffer.data(), blockSize); drwav_f32_to_s16(interleavedPcm.data(), interleavedBuffer.data(), 2 * blockSize);
numFramesWritten += drwav_write_pcm_frames(&outputFile, blockSize, interleavedPcm.data());
} }
if (!useEOT) { if (!useEOT) {
@ -186,12 +200,13 @@ int main(int argc, char** argv)
while (averagePower > 1e-12f) { while (averagePower > 1e-12f) {
synth.renderBlock(audioBuffer); synth.renderBlock(audioBuffer);
sfz::writeInterleaved(audioBuffer.getConstSpan(0), audioBuffer.getConstSpan(1), absl::MakeSpan(interleavedBuffer)); sfz::writeInterleaved(audioBuffer.getConstSpan(0), audioBuffer.getConstSpan(1), absl::MakeSpan(interleavedBuffer));
numFramesWritten += outputFile.writef(interleavedBuffer.data(), blockSize); drwav_f32_to_s16(interleavedPcm.data(), interleavedBuffer.data(), 2 * blockSize);
numFramesWritten += drwav_write_pcm_frames(&outputFile, blockSize, interleavedPcm.data());
averagePower = sfz::meanSquared<float>(interleavedBuffer); averagePower = sfz::meanSquared<float>(interleavedBuffer);
} }
} }
outputFile.writeSync(); drwav_uninit(&outputFile);
LOG_INFO("Wrote " << numFramesWritten << " frames of sound data in" << outputPath.string()); LOG_INFO("Wrote " << numFramesWritten << " frames of sound data in" << outputPath.string());
return 0; return 0;

2
cmake/SfizzDeps.cmake
View file

@ -57,7 +57,7 @@ add_library(sfizz::cxxopts ALIAS sfizz_cxxopts)
target_include_directories(sfizz_cxxopts INTERFACE "external/cxxopts") target_include_directories(sfizz_cxxopts INTERFACE "external/cxxopts")
# The sndfile library # The sndfile library
if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_DEVTOOLS OR SFIZZ_BENCHMARKS OR SFIZZ_RENDER) if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_DEVTOOLS OR SFIZZ_BENCHMARKS)
add_library(sfizz_sndfile INTERFACE) add_library(sfizz_sndfile INTERFACE)
add_library(sfizz::sndfile ALIAS sfizz_sndfile) add_library(sfizz::sndfile ALIAS sfizz_sndfile)
if(SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")