lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix various audio logging

This commit is contained in:
Nevyn Bengtsson 2020-12-11 23:32:23 +01:00 committed by Bjorn
parent f98140c601
commit 035f48927a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio/audio.c
View File

@ -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");
}

1
src/modules/data/soundData.c
View File

@ -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;
}