From 035f48927af85633914e50dd69d77a0fcc834998 Mon Sep 17 00:00:00 2001 From: Nevyn Bengtsson Date: Fri, 11 Dec 2020 23:32:23 +0100 Subject: [PATCH] fix various audio logging --- src/modules/audio/audio.c | 8 +++++--- src/modules/data/soundData.c | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/audio/audio.c b/src/modules/audio/audio.c index dd0d88b7..ae148ed1 100644 --- a/src/modules/audio/audio.c +++ b/src/modules/audio/audio.c @@ -409,6 +409,8 @@ uint32_t lovrAudioGetCaptureSampleCount() { return ma_pcm_rb_available_read(&state.captureRingbuffer); } +static const char *format2string(SampleFormat f) { return f == SAMPLE_I16 ? "i16" : "f32"; } + struct SoundData* lovrAudioCapture(uint32_t frameCount, SoundData *soundData, uint32_t offset) { uint32_t bufferedFrames = lovrAudioGetCaptureSampleCount(); @@ -423,9 +425,9 @@ struct SoundData* lovrAudioCapture(uint32_t frameCount, SoundData *soundData, ui if (soundData == NULL) { soundData = lovrSoundDataCreateRaw(frameCount, CAPTURE_CHANNELS, LOVR_AUDIO_SAMPLE_RATE, OUTPUT_FORMAT, NULL); } else { - lovrAssert(soundData->channels == CAPTURE_CHANNELS, "Capture and SoundData channel counts must match"); - lovrAssert(soundData->sampleRate == LOVR_AUDIO_SAMPLE_RATE, "Capture and SoundData sample rates must match"); - lovrAssert(soundData->format == OUTPUT_FORMAT, "Capture and SoundData formats must match"); + lovrAssert(soundData->channels == CAPTURE_CHANNELS, "Capture (%d) and SoundData (%d) channel counts must match", CAPTURE_CHANNELS, soundData->channels); + lovrAssert(soundData->sampleRate == LOVR_AUDIO_SAMPLE_RATE, "Capture (%d) and SoundData (%d) sample rates must match", LOVR_AUDIO_SAMPLE_RATE, soundData->sampleRate); + lovrAssert(soundData->format == OUTPUT_FORMAT, "Capture (%s) and SoundData (%s) formats must match", format2string(OUTPUT_FORMAT), format2string(soundData->format)); lovrAssert(offset + frameCount <= soundData->frames, "Tried to write samples past the end of a SoundData buffer"); } diff --git a/src/modules/data/soundData.c b/src/modules/data/soundData.c index 7c7c0ff8..b6c1b3d8 100644 --- a/src/modules/data/soundData.c +++ b/src/modules/data/soundData.c @@ -173,7 +173,6 @@ size_t lovrSoundDataStreamAppendBlob(SoundData *dest, struct Blob* blob) { ma_result commit_status = ma_pcm_rb_commit_write(dest->ring, availableFrames, store); lovrAssert(commit_status == MA_SUCCESS, "Failed to commit to ring buffer"); if (availableFrames == 0) { - lovrLog(LOG_WARN, "audio", "SoundData's stream ring buffer is overrun; appended %d and dropping %d frames of data", framesAppended, frameCount); return framesAppended; }