IQ Tool: implement buffered file reader

And add IQ player repeat option...

Author: vladisslav2011

src/applications/gqrx/mainwindow.cpp

@@ -281,7 +281,8 @@ MainWindow::MainWindow(const QString& cfgfile, bool edit_conf, QWidget *parent)
     // I/Q playback
     connect(iq_tool, SIGNAL(startRecording(QString, enum receiver::file_formats, int)), this, SLOT(startIqRecording(QString, enum receiver::file_formats, int)));
     connect(iq_tool, SIGNAL(stopRecording()), this, SLOT(stopIqRecording()));
-    connect(iq_tool, SIGNAL(startPlayback(QString, float, qint64, enum receiver::file_formats, bool)), this, SLOT(startIqPlayback(QString, float, qint64, enum receiver::file_formats, bool)));
+    connect(iq_tool, SIGNAL(startPlayback(QString, float, qint64, enum receiver::file_formats, int, bool)),
+                 this, SLOT(startIqPlayback(QString, float, qint64, enum receiver::file_formats, int, bool)));
     connect(iq_tool, SIGNAL(stopPlayback()), this, SLOT(stopIqPlayback()));
     connect(iq_tool, SIGNAL(seek(qint64)), this,SLOT(seekIqFile(qint64)));
 
@@ -1377,26 +1378,30 @@ double MainWindow::setSqlLevelAuto()
 void MainWindow::meterTimeout()
 {
     float level;
-    struct receiver::iq_recorder_stats iq_stats;
+    struct receiver::iq_tool_stats iq_stats;
 
     level = rx->get_signal_pwr();
     ui->sMeter->setLevel(level);
     remote->setSignalLevel(level);
     // As it looks like this timer is always active (when the DSP is running),
     // check iq recorder state here too
-    rx->get_iq_recorder_stats(iq_stats);
-    if(iq_stats.active)
+    rx->get_iq_tool_stats(iq_stats);
+    if(iq_stats.recording)
     {
         if(iq_stats.failed)
         {
             //stop the recorder
-            iq_tool->updateStats(iq_stats.failed, iq_stats.buffers_used, iq_stats.file_size);
+            iq_tool->updateStats(iq_stats.failed, iq_stats.buffer_usage, iq_stats.file_pos);
             iq_tool->cancelRecording();
         }else{
             //update status
-            iq_tool->updateStats(iq_stats.failed, iq_stats.buffers_used, iq_stats.file_size);
+            iq_tool->updateStats(iq_stats.failed, iq_stats.buffer_usage, iq_stats.file_pos);
         }
     }
+    if(iq_stats.playing)
+    {
+        iq_tool->updateStats(iq_stats.failed, iq_stats.buffer_usage, iq_stats.file_pos);
+    }
 }
 
 #define LOG2_10 3.321928094887362
@@ -1661,7 +1666,8 @@ void MainWindow::stopIqRecording()
 
 void MainWindow::startIqPlayback(const QString& filename, float samprate,
                                  qint64 center_freq,
-                                 enum receiver::file_formats fmt, bool repeat)
+                                 enum receiver::file_formats fmt,
+                                 int buffers_max, bool repeat)
 {
     if (ui->actionDSP->isChecked())
     {
@@ -1682,7 +1688,7 @@ void MainWindow::startIqPlayback(const QString& filename, float samprate,
 
     rx->set_input_device(devstr.toStdString());
     updateHWFrequencyRange(false);
-    rx->set_input_file(filename.toStdString(), samprate, fmt, repeat);
+    rx->set_input_file(filename.toStdString(), samprate, fmt, buffers_max, repeat);
 
     // sample rate
     auto actual_rate = rx->set_input_rate(samprate);

src/applications/gqrx/mainwindow.h

@@ -180,10 +180,12 @@ private slots:
     void stopAudioStreaming();
 
     /* I/Q playback and recording*/
-    void startIqRecording(const QString& recdir, enum receiver::file_formats fmt, int buffers_max);
+    void startIqRecording(const QString& recdir,
+                          enum receiver::file_formats fmt, int buffers_max);
     void stopIqRecording();
-    void startIqPlayback(const QString& filename, float samprate, qint64 center_freq,
-                         enum receiver::file_formats fmt, bool repeat);
+    void startIqPlayback(const QString& filename, float samprate,
+                         qint64 center_freq, enum receiver::file_formats fmt,
+                         int buffers_max, bool repeat);
     void stopIqPlayback();
     void seekIqFile(qint64 seek_pos);
 

src/applications/gqrx/receiver.cpp

@@ -115,7 +115,7 @@ receiver::receiver(const std::string input_device,
     ddc = make_downconverter_cc(d_ddc_decim, 0.0, d_decim_rate);
     rx  = make_nbrx(d_quad_rate, d_audio_rate);
 
-    input_file = gr::blocks::file_source::make(sizeof(gr_complex),get_zero_file().c_str(),false);
+    input_file = file_source::make(sizeof(gr_complex),get_zero_file().c_str(),0,0,1);
     input_throttle = gr::blocks::throttle::make(sizeof(gr_complex),192000.0);
 
     to_s32lc = any_to_any<gr_complex,std::complex<int32_t>>::make();
@@ -263,12 +263,14 @@ void receiver::set_input_device(const std::string device)
  * @param fmt
  */
 void receiver::set_input_file(const std::string name, const int sample_rate,
-                              const enum file_formats fmt, bool repeat)
+                              const enum file_formats fmt, int buffers_max,
+                              bool repeat)
 {
     std::string error = "";
     size_t sample_size = sample_size_from_format(fmt);
 
-    input_file = gr::blocks::file_source::make(sample_size, name.c_str(), repeat);
+    input_file = file_source::make(sample_size, name.c_str(), 0, 0, sample_rate,
+                                   repeat,buffers_max);
 
     if (d_running)
     {
@@ -1485,14 +1487,19 @@ receiver::status receiver::seek_iq_file(long pos)
     return status;
 }
 
-void receiver::get_iq_recorder_stats(struct iq_recorder_stats &stats)
+void receiver::get_iq_tool_stats(struct iq_tool_stats &stats)
 {
-    stats.active = d_recording_iq;
+    stats.recording = d_recording_iq;
+    stats.playing = (d_last_format != FILE_FORMAT_NONE);
     if(d_recording_iq && iq_sink)
     {
         stats.failed = iq_sink->get_failed();
-        stats.buffers_used = iq_sink->get_buffer_usage();
-        stats.file_size = iq_sink->get_written();
+        stats.buffer_usage = iq_sink->get_buffer_usage();
+        stats.file_pos = iq_sink->get_written();
+    }else{
+        stats.failed = input_file->get_failed();
+        stats.buffer_usage = input_file->get_buffer_usage();
+        stats.file_pos = input_file->tell();
     }
 }
 

src/applications/gqrx/receiver.h

@@ -29,8 +29,8 @@
 #include <gnuradio/blocks/multiply_const.h>
 #endif
 
-#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/blocks/file_source.h>
+//#include <gnuradio/blocks/file_sink.h>
+//#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/blocks/wavfile_sink.h>
 #include <gnuradio/blocks/wavfile_source.h>
@@ -54,6 +54,7 @@
 #include "dsp/format_converter.h"
 #include "interfaces/udp_sink_f.h"
 #include "interfaces/file_sink.h"
+#include "interfaces/file_source.h"
 #include "receivers/receiver_base.h"
 
 #ifdef WITH_PULSEAUDIO
@@ -126,12 +127,13 @@ class receiver
         FILE_FORMAT_CS32LU,
     };
 
-    struct iq_recorder_stats
+    struct iq_tool_stats
     {
-        bool active;
+        bool recording;
+        bool playing;
         bool failed;
-        int buffers_used;
-        size_t file_size;
+        int buffer_usage;
+        size_t file_pos;
      };
 
     receiver(const std::string input_device="",
@@ -144,7 +146,8 @@ class receiver
     void        set_input_device(const std::string device);
     void        set_output_device(const std::string device);
     void        set_input_file(const std::string name, const int sample_rate,
-                               const enum file_formats fmt, bool repeat);
+                               const enum file_formats fmt, int buffers_max,
+                               bool repeat);
 
     std::vector<std::string> get_antennas(void) const;
     void        set_antenna(const std::string &antenna);
@@ -241,8 +244,8 @@ class receiver
     status      start_iq_recording(const std::string filename, const enum file_formats fmt, int buffers_max);
     status      stop_iq_recording();
     status      seek_iq_file(long pos);
-    void        get_iq_recorder_stats(struct iq_recorder_stats &stats);
-    bool        is_playing_iq() const { return !(d_iq_fmt == FILE_FORMAT_NONE); }
+    void        get_iq_tool_stats(struct iq_tool_stats &stats);
+    bool        is_playing_iq() { return d_iq_fmt != FILE_FORMAT_NONE; }
 
     /* sample sniffer */
     status      start_sniffer(unsigned int samplrate, int buffsize);
@@ -329,7 +332,7 @@ class receiver
     any_to_any<std::complex<uint8_t>, gr_complex>::sptr  from_s8uc;
 
     gr::blocks::throttle::sptr                     input_throttle;
-    gr::blocks::file_source::sptr                  input_file;
+    file_source::sptr                              input_file;
 
     gr::blocks::wavfile_sink::sptr      wav_sink;   /*!< WAV file sink for recording. */
     gr::blocks::wavfile_source::sptr    wav_src;    /*!< WAV file source for playback. */

src/interfaces/CMakeLists.txt

@@ -5,4 +5,6 @@ add_source_files(SRCS_LIST
 	udp_sink_f.h
 	file_sink.cpp
 	file_sink.h
+	file_source.cpp
+	file_source.h
 )