mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Copy to UDP/RTP: corrected audio dialog G722 sample rate SDP string display

pull/295/head
f4exb 2019-02-17 18:30:19 +01:00
rodzic d98c4cd3ac
commit ea0767f040
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
sdrgui/gui/audiodialog.cpp
Wyświetl plik

@ -298,7 +298,7 @@ void AudioDialogX::updateOutputSDPString()
{ {
QString format; QString format;
int nChannels = m_outputDeviceInfo.udpChannelMode == AudioOutput::UDPChannelStereo ? 2 : 1; int nChannels = m_outputDeviceInfo.udpChannelMode == AudioOutput::UDPChannelStereo ? 2 : 1;
uint32_t decimationFactor = m_outputDeviceInfo.udpDecimationFactor == 0 ? 1 : m_outputDeviceInfo.udpDecimationFactor; uint32_t effectiveSampleRate = m_outputDeviceInfo.sampleRate / (m_outputDeviceInfo.udpDecimationFactor == 0 ? 1 : m_outputDeviceInfo.udpDecimationFactor);
switch (m_outputDeviceInfo.udpChannelCodec) switch (m_outputDeviceInfo.udpChannelCodec)
{ {
@ -310,6 +310,7 @@ void AudioDialogX::updateOutputSDPString()
break; break;
case AudioOutput::UDPCodecG722: case AudioOutput::UDPCodecG722:
format = "G722"; format = "G722";
effectiveSampleRate /= 2; // codec does a decimation by 2
break; break;
case AudioOutput::UDPCodecL8: case AudioOutput::UDPCodecL8:
format = "L8"; format = "L8";
@ -320,7 +321,7 @@ void AudioDialogX::updateOutputSDPString()
break; break;
} }
ui->outputSDPText->setText(tr("%1/%2/%3").arg(format).arg(m_outputDeviceInfo.sampleRate/decimationFactor).arg(nChannels)); ui->outputSDPText->setText(tr("%1/%2/%3").arg(format).arg(effectiveSampleRate).arg(nChannels));
} }
void AudioDialogX::check() void AudioDialogX::check()