chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with decoder being able to be run multiple times back to back without synchronization

Browse Source
This commit is contained in:
Jordan Sherer 2019-11-12 13:27:45 -05:00
parent 3afcbd32c1
commit 471e85ee97
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
mainwindow.cpp
View File

@ -3939,8 +3939,13 @@ bool MainWindow::isDecodeReady(int submode, qint32 k, qint32 k0, qint32 *pCurren
qint32 framesNeeded = computeFramesNeededForDecode(submode); qint32 framesNeeded = computeFramesNeededForDecode(submode);
qint32 currentCycle = computeCycleForDecode(submode, k); qint32 currentCycle = computeCycleForDecode(submode, k);
qint32 delta = qAbs(k-k0);
if(delta > cycleFrames){
qDebug() << "-->" << submodeName(submode) << "buffer advance delta" << delta;
}
// on buffer loop, prepare proper next decode start // on buffer loop, prepare proper next decode start
if(k < k0){ if(k < k0 || delta > cycleFrames){
*pCurrentDecodeStart = currentCycle * cycleFrames; *pCurrentDecodeStart = currentCycle * cycleFrames;
*pNextDecodeStart = *pCurrentDecodeStart + cycleFrames; *pNextDecodeStart = *pCurrentDecodeStart + cycleFrames;
} }
@ -3952,7 +3957,7 @@ bool MainWindow::isDecodeReady(int submode, qint32 k, qint32 k0, qint32 *pCurren
if(pCycle) *pCycle = currentCycle; if(pCycle) *pCycle = currentCycle;
if(pStart) *pStart = *pCurrentDecodeStart; if(pStart) *pStart = *pCurrentDecodeStart;
if(pSz) *pSz = cycleFrames; // qMax(framesNeeded, k-(*pCurrentDecodeStart)); if(pSz) *pSz = qMax(framesNeeded, k-(*pCurrentDecodeStart));
*pCurrentDecodeStart = *pNextDecodeStart; *pCurrentDecodeStart = *pNextDecodeStart;
*pNextDecodeStart = *pCurrentDecodeStart + cycleFrames; *pNextDecodeStart = *pCurrentDecodeStart + cycleFrames;
@ -4282,33 +4287,41 @@ bool MainWindow::decodeProcessQueue(qint32 *pSubmode){
} }
void MainWindow::decodeStart(){ void MainWindow::decodeStart(){
qDebug() << "--> decoder starting"; if(m_decoderBusy){
qDebug() << " --> kin:" << dec_data.params.kin; qDebug() << "--> decoder cannot start...busy";
qDebug() << " --> newdat:" << dec_data.params.newdat; return;
qDebug() << " --> nsubmodes:" << dec_data.params.nsubmodes;
qDebug() << " --> A:" << dec_data.params.kposA << dec_data.params.kszA;
qDebug() << " --> B:" << dec_data.params.kposB << dec_data.params.kszB;
qDebug() << " --> C:" << dec_data.params.kposC << dec_data.params.kszC;
qDebug() << " --> E:" << dec_data.params.kposE << dec_data.params.kszE;
//newdat=1 ==> this is new data, must do the big FFT
//nagain=1 ==> decode only at fQSO +/- Tol
char *to = (char*)mem_js8->data();
char *from = (char*) dec_data.ss;
int size=sizeof(struct dec_data);
// only copy the params
if(dec_data.params.newdat==0) {
int noffset {offsetof (struct dec_data, params.nutc)};
to += noffset;
from += noffset;
size -= noffset;
} }
memcpy(to, from, qMin(mem_js8->size(), size)); // mark the decoder busy early while we prep the memory copy
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow decoder to start
decodeBusy(true); decodeBusy(true);
{
qDebug() << "--> decoder starting";
qDebug() << " --> kin:" << dec_data.params.kin;
qDebug() << " --> newdat:" << dec_data.params.newdat;
qDebug() << " --> nsubmodes:" << dec_data.params.nsubmodes;
qDebug() << " --> A:" << dec_data.params.kposA << dec_data.params.kposA + dec_data.params.kszA << QString("(%1)").arg(dec_data.params.kszA);
qDebug() << " --> B:" << dec_data.params.kposB << dec_data.params.kposB + dec_data.params.kszB << QString("(%1)").arg(dec_data.params.kszB);
qDebug() << " --> C:" << dec_data.params.kposC << dec_data.params.kposC + dec_data.params.kszC << QString("(%1)").arg(dec_data.params.kszC);
qDebug() << " --> E:" << dec_data.params.kposE << dec_data.params.kposE + dec_data.params.kszE << QString("(%1)").arg(dec_data.params.kszE);
//newdat=1 ==> this is new data, must do the big FFT
//nagain=1 ==> decode only at fQSO +/- Tol
char *to = (char*)mem_js8->data();
char *from = (char*) dec_data.ss;
int size=sizeof(struct dec_data);
// only copy the params
if(dec_data.params.newdat==0) {
int noffset {offsetof (struct dec_data, params.nutc)};
to += noffset;
from += noffset;
size -= noffset;
}
memcpy(to, from, qMin(mem_js8->size(), size));
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow decoder to start
}
} }