VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify AudioNetSink by removing the stereo UDP socket/buffer

This commit is contained in:
f4exb 2018-03-07 13:40:16 +01:00
parent 9648779002
commit bc37dbfd24
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sdrbase/audio/audionetsink.cpp
View File

@ -24,15 +24,9 @@ const int AudioNetSink::m_udpBlockSize = 512;
AudioNetSink::AudioNetSink(QObject *parent, bool stereo) : AudioNetSink::AudioNetSink(QObject *parent, bool stereo) :
m_type(SinkUDP), m_type(SinkUDP),
m_udpBufferAudioMono(0), m_udpBufferAudioMono(0),
m_udpBufferAudioStereo(0),
m_rtpBufferAudio(0) m_rtpBufferAudio(0)
{ {
if (stereo) {
m_udpBufferAudioStereo = new UDPSink<AudioSample>(parent, m_udpBlockSize);
} else {
m_udpBufferAudioMono = new UDPSink<int16_t>(parent, m_udpBlockSize); m_udpBufferAudioMono = new UDPSink<int16_t>(parent, m_udpBlockSize);
}
m_rtpBufferAudio = new RTPSink("127.0.0.1", 9999, stereo ? RTPSink::PayloadL16Stereo : RTPSink::PayloadL16Mono); m_rtpBufferAudio = new RTPSink("127.0.0.1", 9999, stereo ? RTPSink::PayloadL16Stereo : RTPSink::PayloadL16Mono);
} }
@ -41,10 +35,6 @@ AudioNetSink::~AudioNetSink()
if (m_udpBufferAudioMono) { if (m_udpBufferAudioMono) {
delete m_udpBufferAudioMono; delete m_udpBufferAudioMono;
} }
if (m_udpBufferAudioStereo) {
delete m_udpBufferAudioStereo;
}
if (m_rtpBufferAudio) { if (m_rtpBufferAudio) {
delete m_rtpBufferAudio; delete m_rtpBufferAudio;
} }
@ -78,9 +68,6 @@ void AudioNetSink::setDestination(const QString& address, uint16_t port)
if (m_udpBufferAudioMono) { if (m_udpBufferAudioMono) {
m_udpBufferAudioMono->setDestination(address, port); m_udpBufferAudioMono->setDestination(address, port);
} }
if (m_udpBufferAudioStereo) {
m_udpBufferAudioStereo->setDestination(address, port);
}
if (m_rtpBufferAudio) { if (m_rtpBufferAudio) {
m_rtpBufferAudio->setDestination(address, port); m_rtpBufferAudio->setDestination(address, port);
} }
@ -102,10 +89,6 @@ void AudioNetSink::deleteDestination(const QString& address, uint16_t port)
void AudioNetSink::write(qint16 sample) void AudioNetSink::write(qint16 sample)
{ {
if (m_udpBufferAudioMono == 0) {
return;
}
if (m_type == SinkUDP) { if (m_type == SinkUDP) {
m_udpBufferAudioMono->write(sample); m_udpBufferAudioMono->write(sample);
} else if (m_type == SinkRTP) { } else if (m_type == SinkRTP) {
@ -113,29 +96,12 @@ void AudioNetSink::write(qint16 sample)
} }
} }
void AudioNetSink::write(const AudioSample& sample)
{
if (m_udpBufferAudioStereo == 0) {
return;
}
if (m_type == SinkUDP) {
m_udpBufferAudioStereo->write(sample);
} else if (m_type == SinkRTP) {
m_rtpBufferAudio->write((uint8_t *) &sample);
}
}
void AudioNetSink::moveToThread(QThread *thread) void AudioNetSink::moveToThread(QThread *thread)
{ {
if (m_udpBufferAudioMono) { if (m_udpBufferAudioMono) {
m_udpBufferAudioMono->moveToThread(thread); m_udpBufferAudioMono->moveToThread(thread);
} }
if (m_udpBufferAudioStereo) {
m_udpBufferAudioMono->moveToThread(thread);
}
if (m_rtpBufferAudio) { if (m_rtpBufferAudio) {
m_rtpBufferAudio->moveToThread(thread); m_rtpBufferAudio->moveToThread(thread);
} }

2
sdrbase/audio/audionetsink.h
View File

@ -44,7 +44,6 @@ public:
void deleteDestination(const QString& address, uint16_t port); void deleteDestination(const QString& address, uint16_t port);
void write(qint16 sample); void write(qint16 sample);
void write(const AudioSample& sample);
bool isRTPCapable() const; bool isRTPCapable() const;
bool selectType(SinkType type); bool selectType(SinkType type);
@ -56,7 +55,6 @@ public:
protected: protected:
SinkType m_type; SinkType m_type;
UDPSink<qint16> *m_udpBufferAudioMono; UDPSink<qint16> *m_udpBufferAudioMono;
UDPSink<AudioSample> *m_udpBufferAudioStereo;
RTPSink *m_rtpBufferAudio; RTPSink *m_rtpBufferAudio;
}; };