MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-22 08:05:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the FM networking sample rate conversion.

Browse Source
This commit is contained in:
Jonathan Naylor
2021-04-11 19:15:23 +01:00
parent a5ee4284f2
commit cfe9e0fba4
6 changed files with 13 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
FMNetwork.cpp
View File

@@ -27,44 +27,28 @@
const unsigned int BUFFER_LENGTH = 1500U;
CFMNetwork::CFMNetwork(const std::string& protocol, const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int sampleRate, bool debug) :
m_protocol(FMNP_MMDVM),
CFMNetwork::CFMNetwork(const std::string& protocol, const std::string& localAddress, unsigned int localPort, const std::string& gatewayAddress, unsigned int gatewayPort, bool debug) :
m_protocol(FMNP_USRP),
m_socket(localAddress, localPort),
m_addr(),
m_addrLen(0U),
m_sampleRate(sampleRate),
m_debug(debug),
m_enabled(false),
m_buffer(2000U, "FM Network"),
m_pollTimer(1000U, 5U),
m_seqNo(0U)
{
assert(gatewayPort > 0U);
assert(!gatewayAddress.empty());
assert(sampleRate > 0U);
if (CUDPSocket::lookup(gatewayAddress, gatewayPort, m_addr, m_addrLen) != 0)
m_addrLen = 0U;
if (protocol == "USRP")
m_protocol = FMNP_USRP;
#if !defined(_WIN32) && !defined(_WIN64)
int error;
m_incoming = ::src_new(SRC_SINC_FASTEST, 1, &error);
m_outgoing = ::src_new(SRC_SINC_FASTEST, 1, &error);
assert(m_incoming != NULL);
assert(m_outgoing != NULL);
#endif
// if (protocol == "USRP")
// m_protocol = FMNP_USRP;
}
CFMNetwork::~CFMNetwork()
{
#if !defined(_WIN32) && !defined(_WIN64)
::src_delete(m_incoming);
::src_delete(m_outgoing);
#endif
}
bool CFMNetwork::open()
@@ -76,8 +60,6 @@ bool CFMNetwork::open()
LogMessage("Opening FM network connection");
m_pollTimer.start();
return m_socket.open(m_addr);
}
@@ -86,31 +68,6 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
assert(data != NULL);
assert(nSamples > 0U);
#if !defined(_WIN32) && !defined(_WIN64)
assert(m_outgoing != NULL);
float out[1000U];
SRC_DATA src;
if (m_sampleRate != 8000U) {
src.data_in = data;
src.data_out = out;
src.input_frames = nSamples;
src.output_frames = 1000;
src.end_of_input = 0;
src.src_ratio = double(m_sampleRate) / 8000.0;
int ret = ::src_process(m_outgoing, &src);
if (ret != 0) {
LogError("Error up/downsampling of the output audio has an error - %s", src_strerror(ret));
return false;
}
} else {
src.data_out = data;
src.output_frames_gen = nSamples;
}
#endif
unsigned char buffer[1500U];
::memset(buffer, 0x00U, 1500U);
@@ -159,19 +116,10 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
buffer[length++] = 0x00U;
} else {
buffer[length++] = 'F';
buffer[length++] = 'M';
buffer[length++] = 'D';
}
#if defined(_WIN32) || defined(_WIN64)
for (unsigned int i = 0U; i < nSamples; i++) {
short val = short(data[i] * 32767.0F + 0.5F); // Changing audio format from float to S16LE
#else
for (long i = 0L; i < src.output_frames_gen; i++) {
short val = short(src.data_out[i] * 32767.0F + 0.5F); // Changing audio format from float to S16LE
#endif
buffer[length++] = (val >> 0) & 0xFFU;
buffer[length++] = (val >> 8) & 0xFFU;
@@ -187,31 +135,11 @@ bool CFMNetwork::writeData(float* data, unsigned int nSamples)
bool CFMNetwork::writeEOT()
{
if (m_protocol == FMNP_MMDVM) {
unsigned char buffer[10U];
::memset(buffer, 0x00U, 10U);
buffer[0U] = 'F';
buffer[1U] = 'M';
buffer[2U] = 'E';
if (m_debug)
CUtils::dump(1U, "FM Network End of Transmission Sent", buffer, 3U);
return m_socket.write(buffer, 3U, m_addr, m_addrLen);
}
return true;
}
void CFMNetwork::clock(unsigned int ms)
{
m_pollTimer.clock(ms);
if (m_pollTimer.hasExpired()) {
writePoll();
m_pollTimer.start();
}
unsigned char buffer[BUFFER_LENGTH];
sockaddr_storage addr;
@@ -248,19 +176,6 @@ void CFMNetwork::clock(unsigned int ms)
if (type == 0U)
m_buffer.addData(buffer + 32U, length - 32U);
} else {
// Ignore incoming polls
if (::memcmp(buffer, "FMP", 3U) == 0)
return;
// Invalid packet type?
if (::memcmp(buffer, "FMD", 3U) != 0)
return;
if (length < 3)
return;
m_buffer.addData(buffer + 3U, length - 3U);
}
}
@@ -279,58 +194,16 @@ unsigned int CFMNetwork::read(float* data, unsigned int nSamples)
unsigned char buffer[1500U];
m_buffer.getData(buffer, nSamples * sizeof(unsigned short));
#if !defined(_WIN32) && !defined(_WIN64)
assert(m_incoming != NULL);
SRC_DATA src;
if (m_sampleRate != 8000U) {
float in[750U];
for (unsigned int i = 0U; i < nSamples; i++) {
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) + // Changing audio format from U16BE to S16LE
((buffer[i * 2U + 1U] & 0xFFU) << 8); // Changing audio format from U16BE to S16LE
in[i] = (float(val) / 65536.0F); // Changing audio format from U16BE to S16LE
}
src.data_in = in;
src.data_out = data;
src.input_frames = nSamples;
src.output_frames = 750;
src.end_of_input = 0;
src.src_ratio = 8000.0 / double(m_sampleRate);
int ret = ::src_process(m_incoming, &src);
if (ret != 0) {
LogError("Error up/downsampling of the input audio has an error - %s", src_strerror(ret));
return 0U;
}
return src.output_frames_gen;
} else {
#endif
for (unsigned int i = 0U; i < nSamples; i++) {
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) +
((buffer[i * 2U + 1U] & 0xFFU) << 8);
data[i] = float(val) / 65536.0F;
}
return nSamples;
#if !defined(_WIN32) && !defined(_WIN64)
for (unsigned int i = 0U; i < nSamples; i++) {
short val = ((buffer[i * 2U + 0U] & 0xFFU) << 0) + ((buffer[i * 2U + 1U] & 0xFFU) << 8);
data[i] = float(val) / 65536.0F;
}
#endif
return nSamples;
}
void CFMNetwork::reset()
{
#if !defined(_WIN32) && !defined(_WIN64)
assert(m_incoming != NULL);
assert(m_outgoing != NULL);
::src_reset(m_incoming);
::src_reset(m_outgoing);
#endif
m_buffer.clear();
}
@@ -350,19 +223,3 @@ void CFMNetwork::enable(bool enabled)
m_enabled = enabled;
}
void CFMNetwork::writePoll()
{
if (m_protocol == FMNP_MMDVM) {
unsigned char buffer[3U];
buffer[0U] = 'F';
buffer[1U] = 'M';
buffer[2U] = 'P';
if (m_debug)
CUtils::dump(1U, "FM Network Poll Sent", buffer, 3U);
m_socket.write(buffer, 3U, m_addr, m_addrLen);
}
}