From 949fde022dd51edbedd787778ec709205238ad4c Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Thu, 18 Jul 2024 18:10:33 +0200 Subject: [PATCH] fix recorder options not disabled during recording, increase rfnm source dsp frame size and fix long pause when stopping rfnm --- misc_modules/recorder/src/main.cpp | 5 ++- source_modules/rfnm_source/src/main.cpp | 51 ++++++++++++++++--------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/misc_modules/recorder/src/main.cpp b/misc_modules/recorder/src/main.cpp index 19700376..a07e96af 100644 --- a/misc_modules/recorder/src/main.cpp +++ b/misc_modules/recorder/src/main.cpp @@ -249,7 +249,6 @@ private: } ImGui::Columns(1, CONCAT("EndRecorderModeColumns##_", _this->name), false); ImGui::EndGroup(); - if (_this->recording) { style::endDisabled(); } // Recording path if (_this->folderSelect.render("##_recorder_fold_" + _this->name)) { @@ -284,8 +283,11 @@ private: config.release(true); } + if (_this->recording) { style::endDisabled(); } + // Show additional audio options if (_this->recMode == RECORDER_MODE_AUDIO) { + if (_this->recording) { style::beginDisabled(); } ImGui::LeftLabel("Stream"); ImGui::FillWidth(); if (ImGui::Combo(CONCAT("##_recorder_stream_", _this->name), &_this->streamId, _this->audioStreams.txt)) { @@ -294,6 +296,7 @@ private: config.conf[_this->name]["audioStream"] = _this->audioStreams.key(_this->streamId); config.release(true); } + if (_this->recording) { style::endDisabled(); } _this->updateAudioMeter(_this->audioLvl); ImGui::FillWidth(); diff --git a/source_modules/rfnm_source/src/main.cpp b/source_modules/rfnm_source/src/main.cpp index c5244129..e8d1e87f 100644 --- a/source_modules/rfnm_source/src/main.cpp +++ b/source_modules/rfnm_source/src/main.cpp @@ -249,19 +249,6 @@ private: // Open the device _this->openDev = new librfnm(librfnm_transport::LIBRFNM_TRANSPORT_USB, _this->selectedSerial); - // Configure the device - _this->openDev->s->rx.ch[_this->currentPath.chId].enable = RFNM_CH_ON; - _this->openDev->s->rx.ch[_this->currentPath.chId].samp_freq_div_n = _this->samplerates[_this->srId]; - _this->openDev->s->rx.ch[_this->currentPath.chId].freq = _this->freq; - _this->openDev->s->rx.ch[_this->currentPath.chId].gain = _this->gain; - _this->openDev->s->rx.ch[_this->currentPath.chId].rfic_lpf_bw = 100; - _this->openDev->s->rx.ch[_this->currentPath.chId].fm_notch = _this->fmNotch ? rfnm_fm_notch::RFNM_FM_NOTCH_ON : rfnm_fm_notch::RFNM_FM_NOTCH_OFF; - _this->openDev->s->rx.ch[_this->currentPath.chId].path = _this->currentPath.path; - rfnm_api_failcode fail = _this->openDev->set(_this->currentPath.appliesCh); - if (fail != rfnm_api_failcode::RFNM_API_OK) { - flog::error("Failed to configure device: {}", (int)fail); - } - // Configure the stream _this->bufferSize = -1; _this->openDev->rx_stream(librfnm_stream_format::LIBRFNM_STREAM_FORMAT_CS16, &_this->bufferSize); @@ -276,6 +263,22 @@ private: _this->openDev->rx_qbuf(&_this->rxBuf[i]); } + // Flush buffers + _this->openDev->rx_flush(); + + // Configure the device + _this->openDev->s->rx.ch[_this->currentPath.chId].enable = RFNM_CH_ON; + _this->openDev->s->rx.ch[_this->currentPath.chId].samp_freq_div_n = _this->samplerates[_this->srId]; + _this->openDev->s->rx.ch[_this->currentPath.chId].freq = _this->freq; + _this->openDev->s->rx.ch[_this->currentPath.chId].gain = _this->gain; + _this->openDev->s->rx.ch[_this->currentPath.chId].rfic_lpf_bw = 100; + _this->openDev->s->rx.ch[_this->currentPath.chId].fm_notch = _this->fmNotch ? rfnm_fm_notch::RFNM_FM_NOTCH_ON : rfnm_fm_notch::RFNM_FM_NOTCH_OFF; + _this->openDev->s->rx.ch[_this->currentPath.chId].path = _this->currentPath.path; + rfnm_api_failcode fail = _this->openDev->set(_this->currentPath.appliesCh); + if (fail != rfnm_api_failcode::RFNM_API_OK) { + flog::error("Failed to configure device: {}", (int)fail); + } + // Start worker _this->run = true; _this->workerThread = std::thread(&RFNMSourceModule::worker, _this); @@ -295,12 +298,15 @@ private: if (_this->workerThread.joinable()) { _this->workerThread.join(); } _this->stream.clearWriteStop(); + // Stop the RX streaming + _this->openDev->rx_stream_stop(); + // Disable channel _this->openDev->s->rx.ch[_this->currentPath.chId].enable = RFNM_CH_OFF; _this->openDev->set(_this->currentPath.appliesCh); - // Stop the RX streaming - _this->openDev->rx_stream_stop(); + // Flush buffers + _this->openDev->rx_flush(); // Close device delete _this->openDev; @@ -423,8 +429,13 @@ private: int sampCount = bufferSize/4; uint8_t ch = (1 << currentPath.chId); - // TODO: Define number of buffers per swap to maintain 200 fps + // Define number of buffers per swap to maintain 200 fps + int maxBufCount = STREAM_BUFFER_SIZE / sampCount; + int bufCount = (sampleRate / sampCount) / 200; + if (bufCount <= 0) { bufCount = 1; } + if (bufCount > maxBufCount) { bufCount = maxBufCount; } + int count = 0; while (run) { // Receive a buffer auto fail = openDev->rx_dqbuf(&lrxbuf, ch, 1000); @@ -435,13 +446,17 @@ private: else if (fail) { break; } // Convert buffer to CF32 - volk_16i_s32f_convert_32f((float*)stream.writeBuf, (int16_t*)lrxbuf->buf, 32768.0f, sampCount * 2); + volk_16i_s32f_convert_32f((float*)&stream.writeBuf[(count++)*sampCount], (int16_t*)lrxbuf->buf, 32768.0f, sampCount * 2); // Reque buffer openDev->rx_qbuf(lrxbuf); // Swap data - if (!stream.swap(sampCount)) { break; } + if (count >= bufCount) { + if (!stream.swap(count*sampCount)) { break; } + count = 0; + } + } flog::debug("Worker exiting");