VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 21:14:15 -04:00
Code Issues Projects Releases Wiki Activity

Copy audio to UDP/RTP: G722 fixes

Browse Source
This commit is contained in:
f4exb
2019-02-17 06:15:12 +01:00
parent 0ff40fb286
commit 010f6b7ec6
5 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/audio/audionetsink.cpp
+25 -12
View File
@@ -173,10 +173,21 @@ void AudioNetSink::write(qint16 isample)
if (m_type == SinkUDP)
{
if (m_bufferIndex >= m_udpBlockSize)
if (m_codec == CodecG722)
{
m_udpSocket->writeDatagram((const char*)m_data, (qint64 ) m_udpBlockSize, m_address, m_port);
m_bufferIndex = 0;
if (m_bufferIndex >= 2*m_udpBlockSize)
{
m_udpSocket->writeDatagram((const char*) m_data, (qint64 ) m_udpBlockSize, m_address, m_port);
m_bufferIndex = 0;
}
}
else
{
if (m_bufferIndex >= m_udpBlockSize)
{
m_udpSocket->writeDatagram((const char*) m_data, (qint64 ) m_udpBlockSize, m_address, m_port);
m_bufferIndex = 0;
}
}
switch(m_codec)
@@ -202,8 +213,8 @@ void AudioNetSink::write(qint16 isample)
*p = sample;
m_bufferIndex += 1;
if (m_bufferIndex == m_udpBlockSize) {
m_g722.encode((uint8_t *) m_data, (const int16_t*) &m_data[3*m_udpBlockSize], m_udpBlockSize);
if (m_bufferIndex == 2*m_udpBlockSize) {
m_g722.encode((uint8_t *) m_data, (const int16_t*) &m_data[m_udpBlockSize], 2*m_udpBlockSize);
}
}
break;
@@ -236,18 +247,20 @@ void AudioNetSink::write(qint16 isample)
break;
case CodecG722:
{
if (m_bufferIndex >= m_g722BlockSize)
if (m_bufferIndex >= 2*m_g722BlockSize)
{
static const int sz = m_g722BlockSize / sizeof(int16_t);
uint8_t g722_data[sz];
m_g722.encode(g722_data, (const int16_t*) m_data, sz);
m_rtpBufferAudio->write(g722_data, sz);
m_g722.encode((uint8_t *) m_data, (const int16_t*) &m_data[m_g722BlockSize], 2*m_g722BlockSize);
m_bufferIndex = 0;
}
qint16 *p = (qint16*) &m_data[m_bufferIndex];
if (m_bufferIndex%2 == 0) {
m_rtpBufferAudio->write((uint8_t *) &m_data[m_bufferIndex/2]);
}
qint16 *p = (qint16*) &m_data[m_g722BlockSize + 2*m_bufferIndex];
*p = sample;
m_bufferIndex += sizeof(qint16);
m_bufferIndex += 1;
}
break;
case CodecL16: