VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-10 17:58:36 -04:00
Code Issues Projects Releases Wiki Activity

File Input: acceleration and loop handling phase 1

Browse Source
This commit is contained in:
f4exb
2018-10-14 01:16:39 +02:00
parent 1674ab0e29
commit bb1e3f3933
9 changed files with 255 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/filesource/filesourcethread.cpp
+20 -12
View File
@@ -22,8 +22,15 @@
#include "dsp/filerecord.h"
#include "filesourcethread.h"
#include "dsp/samplesinkfifo.h"
#include "util/messagequeue.h"
FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo* sampleFifo, QObject* parent) :
MESSAGE_CLASS_DEFINITION(FileSourceThread::MsgReportEOF, Message)
FileSourceThread::FileSourceThread(std::ifstream *samplesStream,
SampleSinkFifo* sampleFifo,
const QTimer& timer,
MessageQueue *fileInputMessageQueue,
QObject* parent) :
QThread(parent),
m_running(false),
m_ifstream(samplesStream),
@@ -33,6 +40,8 @@ FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo*
m_chunksize(0),
m_sampleFifo(sampleFifo),
m_samplesCount(0),
m_timer(timer),
m_fileInputMessageQueue(fileInputMessageQueue),
m_samplerate(0),
m_samplesize(0),
m_samplebytes(0),
@@ -70,6 +79,7 @@ void FileSourceThread::startWork()
while(!m_running)
m_startWaiter.wait(&m_startWaitMutex, 100);
m_startWaitMutex.unlock();
connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
}
else
{
@@ -80,6 +90,7 @@ void FileSourceThread::startWork()
void FileSourceThread::stopWork()
{
qDebug() << "FileSourceThread::stopWork";
disconnect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
m_running = false;
wait();
}
@@ -101,7 +112,6 @@ void FileSourceThread::setSampleRateAndSize(int samplerate, quint32 samplesize)
m_samplerate = samplerate;
m_samplesize = samplesize;
m_samplebytes = m_samplesize > 16 ? sizeof(int32_t) : sizeof(int16_t);
// TODO: implement FF and slow motion here. 2 corresponds to live. 1 is half speed, 4 is double speed
m_chunksize = (m_samplerate * 2 * m_samplebytes * m_throttlems) / 1000;
setBuffers(m_chunksize);
@@ -161,12 +171,6 @@ void FileSourceThread::run()
m_running = false;
}
void FileSourceThread::connectTimer(const QTimer& timer)
{
qDebug() << "FileSourceThread::connectTimer";
connect(&timer, SIGNAL(timeout()), this, SLOT(tick()));
}
void FileSourceThread::tick()
{
if (m_running)
@@ -187,12 +191,16 @@ void FileSourceThread::tick()
if (m_ifstream->eof())
{
writeToSampleFifo(m_fileBuf, (qint32) m_ifstream->gcount());
MsgReportEOF *message = MsgReportEOF::create();
m_fileInputMessageQueue->push(message);
//m_sampleFifo->write(m_buf, m_ifstream->gcount());
// TODO: handle loop playback situation
m_ifstream->clear();
m_ifstream->seekg(sizeof(FileRecord::Header), std::ios::beg);
m_samplesCount = 0;
//stopWork();
// m_ifstream->clear();
// m_ifstream->seekg(sizeof(FileRecord::Header), std::ios::beg);
// m_samplesCount = 0;
//stopWork();
//m_ifstream->close();
}
else