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

RTP: corrections for stereo

This commit is contained in:
f4exb 2018-03-10 05:49:18 +01:00
parent e8e2176529
commit b183a66d29
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/audio/audionetsink.cpp
View File

@ -142,7 +142,7 @@ void AudioNetSink::write(AudioSample* samples, uint32_t numSamples)
}
else if (m_type == SinkRTP)
{
m_rtpBufferAudio->write((uint8_t *) samples, numSamples*sizeof(AudioSample));
m_rtpBufferAudio->write((uint8_t *) samples, numSamples*2); // 2 x 16 bit sample
}
}

7
sdrbase/util/rtpsink.cpp
View File

@ -73,6 +73,7 @@ RTPSink::~RTPSink()
void RTPSink::setPayloadType(PayloadType payloadType)
{
uint32_t timestampinc;
QMutexLocker locker(&m_mutex);
qDebug("RTPSink::setPayloadType: %d", payloadType);
@ -83,12 +84,14 @@ void RTPSink::setPayloadType(PayloadType payloadType)
m_sampleRate = 48000;
m_sampleBytes = sizeof(AudioSample);
m_rtpSession.SetDefaultPayloadType(96);
timestampinc = m_sampleRate / 100;
break;
case PayloadL16Mono:
default:
m_sampleRate = 48000;
m_sampleBytes = sizeof(int16_t);
m_rtpSession.SetDefaultPayloadType(96);
timestampinc = m_sampleRate / 50;
break;
}
@ -121,12 +124,12 @@ void RTPSink::setPayloadType(PayloadType payloadType)
qDebug("RTPSink::setPayloadType: set default mark to false: %s", qrtplib::RTPGetErrorString(status).c_str());
}
status = m_rtpSession.SetDefaultTimestampIncrement(m_packetSamples);
status = m_rtpSession.SetDefaultTimestampIncrement(timestampinc);
if (status < 0) {
qCritical("RTPSink::setPayloadType: cannot set default timestamp increment: %s", qrtplib::RTPGetErrorString(status).c_str());
} else {
qDebug("RTPSink::setPayloadType: set default timestamp increment to %d: %s", m_packetSamples, qrtplib::RTPGetErrorString(status).c_str());
qDebug("RTPSink::setPayloadType: set default timestamp increment to %d: %s", timestampinc, qrtplib::RTPGetErrorString(status).c_str());
}
status = m_rtpSession.SetMaximumPacketSize(m_bufferSize+40);