VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 13:47:50 -04:00
Code Issues Projects Releases Wiki Activity

Copy audio to UDP/RTP: Opus implementation (5)

Browse Source
This commit is contained in:
f4exb 2019-02-19 02:07:26 +01:00
parent 0aaab42f95
commit bd48a2feb5
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrbase/audio/audionetsink.cpp
View File

@ -175,6 +175,8 @@ void AudioNetSink::setNewCodecData()
<< " Fs: " << m_sampleRate/m_decimation << " Fs: " << m_sampleRate/m_decimation
<< " stereo: " << m_stereo; << " stereo: " << m_stereo;
m_opus.setEncoder(m_sampleRate/m_decimation, m_stereo ? 2 : 1); m_opus.setEncoder(m_sampleRate/m_decimation, m_stereo ? 2 : 1);
m_codecInputIndex = 0;
m_bufferIndex = 0;
} }
setDecimationFilters(); setDecimationFilters();

7
sdrbase/audio/audioopus.cpp
View File

@ -20,12 +20,14 @@
#include "opus/opus.h" #include "opus/opus.h"
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include "audioopus.h" #include "audioopus.h"
AudioOpus::AudioOpus() : AudioOpus::AudioOpus() :
m_encoderState(0), m_encoderState(0),
m_encoderOK(false) m_encoderOK(false),
m_mutex(QMutex::Recursive)
{ {
qDebug("AudioOpus::AudioOpus: libopus version %s", opus_get_version_string()); qDebug("AudioOpus::AudioOpus: libopus version %s", opus_get_version_string());
} }
@ -41,6 +43,7 @@ void AudioOpus::setEncoder(int32_t fs, int nChannels)
{ {
int error; int error;
bool newInstance = true; bool newInstance = true;
QMutexLocker mutexLocker(&m_mutex);
if (m_encoderState) if (m_encoderState)
{ {
@ -85,6 +88,8 @@ void AudioOpus::setEncoder(int32_t fs, int nChannels)
int AudioOpus::encode(int frameSize, int16_t *in, uint8_t *out) int AudioOpus::encode(int frameSize, int16_t *in, uint8_t *out)
{ {
QMutexLocker mutexLocker(&m_mutex);
int nbBytes = opus_encode(m_encoderState, in, frameSize, out, m_maxPacketSize); int nbBytes = opus_encode(m_encoderState, in, frameSize, out, m_maxPacketSize);
if (nbBytes < 0) if (nbBytes < 0)

2
sdrbase/audio/audioopus.h
View File

@ -19,6 +19,7 @@
#define SDRBASE_AUDIO_AUDIOOPUS_H_ #define SDRBASE_AUDIO_AUDIOOPUS_H_
#include <stdint.h> #include <stdint.h>
#include <QMutex>
#include "export.h" #include "export.h"
class OpusEncoder; class OpusEncoder;
@ -38,6 +39,7 @@ public:
private: private:
OpusEncoder *m_encoderState; OpusEncoder *m_encoderState;
bool m_encoderOK; bool m_encoderOK;
QMutex m_mutex;
}; };
#endif /* SDRBASE_AUDIO_AUDIOOPUS_H_ */ #endif /* SDRBASE_AUDIO_AUDIOOPUS_H_ */

7
sdrgui/audio.md
View File

@ -129,12 +129,13 @@ m=audio 9998 RTP/AVP 9
a=rtpmap:9 G722/8000/1 a=rtpmap:9 G722/8000/1
``` ```
For Opus mono: For Opus mono or stereo:
``` ```
c=IN IP4 192.168.0.34 c=IN IP4 192.168.0.34
m=audio 9998 RTP/AVP 101 m=audio 9998 RTP/AVP 96
a=rtpmap:101 opus/48000/1 a=rtpmap:96 opus/48000/2
a=fmtp:96 cbr=1
``` ```
&#9758; Note that on Android clients VLC has trouble working with the RTP stream (choppy audio, hanging unexpectedly...) therefore [MX player](https://play.google.com/store/apps/details?id=com.mxtech.videoplayer.ad&hl=en) is recommended. &#9758; Note that on Android clients VLC has trouble working with the RTP stream (choppy audio, hanging unexpectedly...) therefore [MX player](https://play.google.com/store/apps/details?id=com.mxtech.videoplayer.ad&hl=en) is recommended.

2
sdrgui/gui/audiodialog.cpp
View File

@ -317,6 +317,8 @@ void AudioDialogX::updateOutputSDPString()
break; break;
case AudioOutput::UDPCodecOpus: case AudioOutput::UDPCodecOpus:
format = "opus"; format = "opus";
nChannels = 2; // always 2 even for mono
effectiveSampleRate = 48000; // always 48000 regardless of input rate
break; break;
case AudioOutput::UDPCodecL16: case AudioOutput::UDPCodecL16:
default: default: