From 8582d5273974fe025be2d5392e459c2c90339403 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 14 Feb 2019 14:28:01 +0100 Subject: [PATCH] Audio UDP/RTP: fixed A-law / mu-law compressors --- sdrbase/audio/audiocompressor.cpp | 10 +++++----- sdrbase/audio/audiocompressor.h | 2 +- sdrgui/gui/audiodialog.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdrbase/audio/audiocompressor.cpp b/sdrbase/audio/audiocompressor.cpp index ac4f8a083..65e901cce 100644 --- a/sdrbase/audio/audiocompressor.cpp +++ b/sdrbase/audio/audiocompressor.cpp @@ -86,15 +86,15 @@ void AudioCompressor::fillLUT2() void AudioCompressor::fillALaw() { - for (int i=0; i<8*4096; i++) { - m_lut[i] = ALaw_Encode(i/2 + 16384); + for (int i=-32768; i<32768; i++) { + m_lut[i+32768] = ALaw_Encode(i); } } void AudioCompressor::fillULaw() { - for (int i=0; i<8*4096; i++) { - m_lut[i] = MuLaw_Encode(i/2 + 16384); + for (int i=-32768; i<32768; i++) { + m_lut[i+32768] = MuLaw_Encode(i); } } @@ -107,7 +107,7 @@ int16_t AudioCompressor::compress(int16_t sample) int8_t AudioCompressor::compress8(int16_t sample) { - return m_lut[sample/2 + 16384]; + return m_lut[sample + 32768]; } /* http://dystopiancode.blogspot.com/2012/02/pcm-law-and-u-law-companding-algorithms.html diff --git a/sdrbase/audio/audiocompressor.h b/sdrbase/audio/audiocompressor.h index 5ad144ad5..0e924e1f4 100644 --- a/sdrbase/audio/audiocompressor.h +++ b/sdrbase/audio/audiocompressor.h @@ -37,7 +37,7 @@ private: int8_t ALaw_Encode(int16_t number); int8_t MuLaw_Encode(int16_t number); - int16_t m_lut[32768]; + int16_t m_lut[65536]; static const uint16_t ALAW_MAX; static const uint16_t MULAW_MAX; static const uint16_t MULAW_BIAS; diff --git a/sdrgui/gui/audiodialog.cpp b/sdrgui/gui/audiodialog.cpp index fa40d8329..ed0d08677 100644 --- a/sdrgui/gui/audiodialog.cpp +++ b/sdrgui/gui/audiodialog.cpp @@ -282,7 +282,7 @@ void AudioDialogX::updateOutputSDPString() } int nChannels = m_outputDeviceInfo.udpChannelMode == AudioOutput::UDPChannelStereo ? 2 : 1; - uint32_t decimationFactor = m_outputDeviceInfo.decimationFactor == 0 ? 1 : m_outputDeviceInfo.decimationFactor; + ui->outputSDPText->setText(tr("%1/%2/%3").arg(format).arg(m_outputDeviceInfo.sampleRate/decimationFactor).arg(nChannels)); }