mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

DATV demod: FIFO status event: pass data by copy instead of reference

pull/841/head
f4exb 2021-04-12 00:31:47 +02:00
rodzic f8a512e91b
commit 507b110299
6 zmienionych plików z 14 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
plugins/channelrx/demoddatv/datvdemodgui.cpp
Wyświetl plik

@ -750,18 +750,18 @@ QString DATVDemodGUI::formatBytes(qint64 intBytes)
} }
void DATVDemodGUI::on_StreamDataAvailable(int *intBytes, int *intPercent, qint64 *intTotalReceived) void DATVDemodGUI::on_StreamDataAvailable(int intBytes, int intPercent, qint64 intTotalReceived)
{ {
ui->lblStatus->setText(QString("Data: %1B").arg(formatBytes(*intTotalReceived))); ui->lblStatus->setText(QString("Data: %1B").arg(formatBytes(intTotalReceived)));
m_intLastDecodedData = *intTotalReceived; m_intLastDecodedData = intTotalReceived;
if((*intPercent)<100) { if ((intPercent)<100) {
ui->prgSynchro->setValue(*intPercent); ui->prgSynchro->setValue(intPercent);
} else { } else {
ui->prgSynchro->setValue(100); ui->prgSynchro->setValue(100);
} }
m_intReadyDecodedData = *intBytes; m_intReadyDecodedData = intBytes;
} }
void DATVDemodGUI::on_deltaFrequency_changed(qint64 value) void DATVDemodGUI::on_deltaFrequency_changed(qint64 value)

2
plugins/channelrx/demoddatv/datvdemodgui.h
Wyświetl plik

@ -78,7 +78,7 @@ private slots:
void on_chkAllowDrift_clicked(); void on_chkAllowDrift_clicked();
void on_fullScreen_clicked(); void on_fullScreen_clicked();
void on_mouseEvent(QMouseEvent* obj); void on_mouseEvent(QMouseEvent* obj);
void on_StreamDataAvailable(int *intBytes, int *intPercent, qint64 *intTotalReceived); void on_StreamDataAvailable(int intBytes, int intPercent, qint64 intTotalReceived);
void on_StreamMetaDataChanged(DataTSMetaData2 *objMetaData); void on_StreamMetaDataChanged(DataTSMetaData2 *objMetaData);
void on_chkFastlock_clicked(); void on_chkFastlock_clicked();
void on_cmbFilter_currentIndexChanged(int index); void on_cmbFilter_currentIndexChanged(int index);

6
plugins/channelrx/demoddatv/datvideostream.cpp
Wyświetl plik

@ -56,7 +56,7 @@ void DATVideostream::cleanUp()
void DATVideostream::resetTotalReceived() void DATVideostream::resetTotalReceived()
{ {
m_totalReceived = 0; m_totalReceived = 0;
emit fifoData(&m_bytesWaiting, &m_percentBuffer, &m_totalReceived); emit fifoData(m_bytesWaiting, m_percentBuffer, m_totalReceived);
} }
void DATVideostream::setMultiThreaded(bool multiThreaded) void DATVideostream::setMultiThreaded(bool multiThreaded)
@ -100,7 +100,7 @@ int DATVideostream::pushData(const char * chrData, int intSize)
m_percentBuffer = m_percentBuffer > 100 ? 100 : m_percentBuffer; m_percentBuffer = m_percentBuffer > 100 ? 100 : m_percentBuffer;
if (m_packetReceived % 10 == 1) { if (m_packetReceived % 10 == 1) {
emit fifoData(&m_bytesWaiting, &m_percentBuffer, &m_totalReceived); emit fifoData(m_bytesWaiting, m_percentBuffer, m_totalReceived);
} }
return intSize; return intSize;
@ -209,7 +209,7 @@ qint64 DATVideostream::readData(char *data, qint64 len)
m_percentBuffer = m_percentBuffer > 100 ? 100 : m_percentBuffer; m_percentBuffer = m_percentBuffer > 100 ? 100 : m_percentBuffer;
if (m_packetReceived % 10 == 0) { if (m_packetReceived % 10 == 0) {
emit fifoData(&m_bytesWaiting, &m_percentBuffer, &m_totalReceived); emit fifoData(m_bytesWaiting, m_percentBuffer, m_totalReceived);
} }
//Next available DATA //Next available DATA

2
plugins/channelrx/demoddatv/datvideostream.h
Wyświetl plik

@ -50,7 +50,7 @@ public:
signals: signals:
void dataAvailable(); void dataAvailable();
void fifoData(int *intDataBytes, int *intPercentBuffer, qint64 *intTotalReceived); void fifoData(int intDataBytes, int intPercentBuffer, qint64 intTotalReceived);
protected: protected:
virtual qint64 readData(char *data, qint64 len); virtual qint64 readData(char *data, qint64 len);

5
plugins/channelrx/demoddatv/datvudpstream.cpp
Wyświetl plik

@ -28,7 +28,6 @@ DATVUDPStream::DATVUDPStream(int tsBlockSize) :
m_tsBlockSize(tsBlockSize), m_tsBlockSize(tsBlockSize),
m_tsBlockIndex(0), m_tsBlockIndex(0),
m_dataBytes(0), m_dataBytes(0),
m_percentBuffer(0),
m_totalBytes(0), m_totalBytes(0),
m_fifoSignalCount(0) m_fifoSignalCount(0)
{ {
@ -62,7 +61,7 @@ void DATVUDPStream::pushData(const char *chrData, int nbTSBlocks)
if (++m_fifoSignalCount == 10) if (++m_fifoSignalCount == 10)
{ {
emit fifoData(&m_dataBytes, &m_percentBuffer, &m_totalBytes); emit fifoData(m_dataBytes, 0, m_totalBytes);
m_fifoSignalCount = 0; m_fifoSignalCount = 0;
} }
@ -75,5 +74,5 @@ void DATVUDPStream::pushData(const char *chrData, int nbTSBlocks)
void DATVUDPStream::resetTotalReceived() void DATVUDPStream::resetTotalReceived()
{ {
m_totalBytes = 0; m_totalBytes = 0;
emit fifoData(&m_dataBytes, &m_percentBuffer, &m_totalBytes); emit fifoData(m_dataBytes, 0, m_totalBytes);
} }

3
plugins/channelrx/demoddatv/datvudpstream.h
Wyświetl plik

@ -41,7 +41,7 @@ public:
static const int m_tsBlocksPerFrame; static const int m_tsBlocksPerFrame;
signals: signals:
void fifoData(int *dataBytes, int *percentBuffer, qint64 *totalReceived); void fifoData(int dataBytes, int percentBuffer, qint64 totalReceived);
private: private:
bool m_active; bool m_active;
@ -52,7 +52,6 @@ private:
int m_tsBlockIndex; int m_tsBlockIndex;
char *m_tsBuffer; char *m_tsBuffer;
int m_dataBytes; int m_dataBytes;
int m_percentBuffer;
qint64 m_totalBytes; qint64 m_totalBytes;
int m_fifoSignalCount; int m_fifoSignalCount;
}; };