VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 21:57:51 -04:00
Code Issues Projects Releases Wiki Activity

File Source plugin: skip header when seeking in I/Q recording

Browse Source
This commit is contained in:
f4exb 2016-10-08 10:02:36 +02:00
parent e9f23ed2bf
commit 008ee56252
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -136,7 +136,7 @@ void FileSourceInput::seekFileStream(int seekPercentage)
m_fileSourceThread->setSamplesCount(seekPoint); m_fileSourceThread->setSamplesCount(seekPoint);
seekPoint *= 4; // + sizeof(FileSink::Header) seekPoint *= 4; // + sizeof(FileSink::Header)
m_ifstream.clear(); m_ifstream.clear();
m_ifstream.seekg(seekPoint, std::ios::beg); m_ifstream.seekg(seekPoint + sizeof(FileRecord::Header), std::ios::beg);
} }
} }
@ -152,7 +152,7 @@ bool FileSourceInput::start(int device)
if (m_ifstream.tellg() != 0) { if (m_ifstream.tellg() != 0) {
m_ifstream.clear(); m_ifstream.clear();
m_ifstream.seekg(0, std::ios::beg); m_ifstream.seekg(sizeof(FileRecord::Header), std::ios::beg);
} }
if(!m_sampleFifo.setSize(m_sampleRate * 4)) { if(!m_sampleFifo.setSize(m_sampleRate * 4)) {

9
plugins/samplesource/filesource/filesourcethread.cpp
View File

@ -19,8 +19,9 @@
#include <assert.h> #include <assert.h>
#include <QDebug> #include <QDebug>
#include "dsp/filerecord.h"
#include "filesourcethread.h" #include "filesourcethread.h"
#include "../../../sdrbase/dsp/samplesinkfifo.h" #include "dsp/samplesinkfifo.h"
FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo* sampleFifo, QObject* parent) : FileSourceThread::FileSourceThread(std::ifstream *samplesStream, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent), QThread(parent),
@ -52,7 +53,7 @@ FileSourceThread::~FileSourceThread()
void FileSourceThread::startWork() void FileSourceThread::startWork()
{ {
qDebug() << "FileSourceThread::startWork: "; qDebug() << "FileSourceThread::startWork: ";
if (m_ifstream->is_open()) if (m_ifstream->is_open())
{ {
qDebug() << "FileSourceThread::startWork: file stream open, starting..."; qDebug() << "FileSourceThread::startWork: file stream open, starting...";
@ -157,13 +158,13 @@ void FileSourceThread::tick()
// read samples directly feeding the SampleFifo (no callback) // read samples directly feeding the SampleFifo (no callback)
m_ifstream->read(reinterpret_cast<char*>(m_buf), m_chunksize); m_ifstream->read(reinterpret_cast<char*>(m_buf), m_chunksize);
if (m_ifstream->eof()) if (m_ifstream->eof())
{ {
m_sampleFifo->write(m_buf, m_ifstream->gcount()); m_sampleFifo->write(m_buf, m_ifstream->gcount());
// TODO: handle loop playback situation // TODO: handle loop playback situation
m_ifstream->clear(); m_ifstream->clear();
m_ifstream->seekg(0, std::ios::beg); m_ifstream->seekg(sizeof(FileRecord::Header), std::ios::beg);
m_samplesCount = 0; m_samplesCount = 0;
//stopWork(); //stopWork();
//m_ifstream->close(); //m_ifstream->close();