From cfd9b508a3e6b6d6063dc8143c4ab587d876db60 Mon Sep 17 00:00:00 2001 From: Rodney Date: Mar 27 2021 14:31:29 +0000 Subject: Merge pull request #3825 from shun-iwasawa/fix_win_audio_recording Fix Crash on Recording Audio on Windows --- diff --git a/toonz/sources/toonz/audiorecordingpopup.cpp b/toonz/sources/toonz/audiorecordingpopup.cpp index be966dc..7e6e343 100644 --- a/toonz/sources/toonz/audiorecordingpopup.cpp +++ b/toonz/sources/toonz/audiorecordingpopup.cpp @@ -173,11 +173,11 @@ AudioRecordingPopup::AudioRecordingPopup() m_probe->setSource(m_audioRecorder); QAudioEncoderSettings audioSettings; audioSettings.setCodec("audio/PCM"); -#ifdef MACOSX + // setting the sample rate to some value (like 44100) + // may cause divide-by-zero crash in QAudioDeviceInfo::nearestFormat() + // so here we set the value to -1, as the documentation says; + // "A value of -1 indicates the encoder should make an optimal choice" audioSettings.setSampleRate(-1); -#else - audioSettings.setSampleRate(44100); -#endif audioSettings.setChannelCount(1); audioSettings.setBitRate(16); audioSettings.setEncodingMode(QMultimedia::ConstantBitRateEncoding);