Skip to content

Commit 59a975b

Browse files
grishkagrishka
committed
Fixes
1 parent 8fd89fc commit 59a975b

10 files changed

+73
-43
lines changed

‎EchoCanceller.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AudioEffect{
5959
virtual void Process(int16_t* inOut, size_t numSamples)=0;
6060
virtual void SetPassThrough(bool passThrough);
6161
protected:
62-
bool passThrough;
62+
bool passThrough=false;
6363
};
6464

6565
class Volume : public AudioEffect{

‎OpusEncoder.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "OpusEncoder.h"
88
#include <assert.h>
9+
#include <algorithm>
910
#include "logging.h"
1011
#include "VoIPServerConfig.h"
1112
#ifdef HAVE_CONFIG_H

‎os/linux/AudioInputPulse.cpp

+32-18
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,13 @@ AudioInputPulse::AudioInputPulse(pa_context* context, pa_threaded_mainloop* main
3333
remainingDataSize=0;
3434

3535
pa_threaded_mainloop_lock(mainloop);
36-
pa_sample_spec sample_specifications{
37-
.format=PA_SAMPLE_S16LE,
38-
.rate=48000,
39-
.channels=1
40-
};
4136

42-
pa_proplist* proplist=pa_proplist_new();
43-
pa_proplist_sets(proplist, PA_PROP_FILTER_APPLY, ""); // according to PA sources, this disables any possible filters
44-
stream=pa_stream_new_with_proplist(context, "libtgvoip capture", &sample_specifications, NULL, proplist);
45-
pa_proplist_free(proplist);
37+
stream=CreateAndInitStream();
38+
pa_threaded_mainloop_unlock(mainloop);
39+
isLocked=false;
4640
if(!stream){
47-
LOGE("Error initializing PulseAudio (pa_stream_new)");
48-
failed=true;
4941
return;
5042
}
51-
pa_stream_set_state_callback(stream, AudioInputPulse::StreamStateCallback, this);
52-
pa_stream_set_read_callback(stream, AudioInputPulse::StreamReadCallback, this);
53-
pa_threaded_mainloop_unlock(mainloop);
54-
isLocked=false;
5543

5644
SetCurrentDevice(devID);
5745
}
@@ -63,6 +51,26 @@ AudioInputPulse::~AudioInputPulse(){
6351
}
6452
}
6553

54+
pa_stream* AudioInputPulse::CreateAndInitStream(){
55+
pa_sample_spec sampleSpec{
56+
.format=PA_SAMPLE_S16LE,
57+
.rate=48000,
58+
.channels=1
59+
};
60+
pa_proplist* proplist=pa_proplist_new();
61+
pa_proplist_sets(proplist, PA_PROP_FILTER_APPLY, ""); // according to PA sources, this disables any possible filters
62+
pa_stream* stream=pa_stream_new_with_proplist(context, "libtgvoip capture", &sampleSpec, NULL, proplist);
63+
pa_proplist_free(proplist);
64+
if(!stream){
65+
LOGE("Error initializing PulseAudio (pa_stream_new)");
66+
failed=true;
67+
return NULL;
68+
}
69+
pa_stream_set_state_callback(stream, AudioInputPulse::StreamStateCallback, this);
70+
pa_stream_set_read_callback(stream, AudioInputPulse::StreamReadCallback, this);
71+
return stream;
72+
}
73+
6674
void AudioInputPulse::Start(){
6775
if(failed || isRecording)
6876
return;
@@ -92,7 +100,9 @@ void AudioInputPulse::SetCurrentDevice(std::string devID){
92100
currentDevice=devID;
93101
if(isRecording && isConnected){
94102
pa_stream_disconnect(stream);
103+
pa_stream_unref(stream);
95104
isConnected=false;
105+
stream=CreateAndInitStream();
96106
}
97107

98108
pa_buffer_attr bufferAttr={
@@ -105,16 +115,20 @@ void AudioInputPulse::SetCurrentDevice(std::string devID){
105115
int streamFlags=PA_STREAM_START_CORKED | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY;
106116

107117
int err=pa_stream_connect_record(stream, devID=="default" ? NULL : devID.c_str(), &bufferAttr, (pa_stream_flags_t)streamFlags);
108-
if(err!=0 && devID!="default"){
109-
SetCurrentDevice("default");
110-
return;
118+
if(err!=0){
119+
pa_threaded_mainloop_unlock(mainloop);
120+
/*if(devID!="default"){
121+
SetCurrentDevice("default");
122+
return;
123+
}*/
111124
}
112125
CHECK_ERROR(err, "pa_stream_connect_record");
113126

114127
while(true){
115128
pa_stream_state_t streamState=pa_stream_get_state(stream);
116129
if(!PA_STREAM_IS_GOOD(streamState)){
117130
LOGE("Error connecting to audio device '%s'", devID.c_str());
131+
pa_threaded_mainloop_unlock(mainloop);
118132
failed=true;
119133
return;
120134
}

‎os/linux/AudioInputPulse.h

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class AudioInputPulse : public AudioInput{
3030
static void StreamStateCallback(pa_stream* s, void* arg);
3131
static void StreamReadCallback(pa_stream* stream, size_t requested_bytes, void* userdata);
3232
void StreamReadCallback(pa_stream* stream, size_t requestedBytes);
33+
pa_stream* CreateAndInitStream();
3334

3435
pa_threaded_mainloop* mainloop;
3536
pa_context* context;

‎os/linux/AudioOutputPulse.cpp

+21-16
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,38 @@ AudioOutputPulse::AudioOutputPulse(pa_context* context, pa_threaded_mainloop* ma
3434
stream=NULL;
3535
remainingDataSize=0;
3636

37-
pa_sample_spec sample_specifications{
37+
pa_threaded_mainloop_lock(mainloop);
38+
stream=CreateAndInitStream();
39+
pa_threaded_mainloop_unlock(mainloop);
40+
41+
SetCurrentDevice(devID);
42+
}
43+
44+
AudioOutputPulse::~AudioOutputPulse(){
45+
if(stream){
46+
pa_stream_disconnect(stream);
47+
pa_stream_unref(stream);
48+
}
49+
}
50+
51+
pa_stream* AudioOutputPulse::CreateAndInitStream(){
52+
pa_sample_spec sampleSpec{
3853
.format=PA_SAMPLE_S16LE,
3954
.rate=48000,
4055
.channels=1
4156
};
42-
43-
pa_threaded_mainloop_lock(mainloop);
4457
pa_proplist* proplist=pa_proplist_new();
4558
pa_proplist_sets(proplist, PA_PROP_FILTER_APPLY, ""); // according to PA sources, this disables any possible filters
46-
stream=pa_stream_new_with_proplist(context, "libtgvoip playback", &sample_specifications, NULL, proplist);
59+
pa_stream* stream=pa_stream_new_with_proplist(context, "libtgvoip playback", &sampleSpec, NULL, proplist);
4760
pa_proplist_free(proplist);
4861
if(!stream){
4962
LOGE("Error initializing PulseAudio (pa_stream_new)");
50-
pa_threaded_mainloop_unlock(mainloop);
5163
failed=true;
52-
return;
64+
return NULL;
5365
}
5466
pa_stream_set_state_callback(stream, AudioOutputPulse::StreamStateCallback, this);
5567
pa_stream_set_write_callback(stream, AudioOutputPulse::StreamWriteCallback, this);
56-
pa_threaded_mainloop_unlock(mainloop);
57-
58-
SetCurrentDevice(devID);
59-
}
60-
61-
AudioOutputPulse::~AudioOutputPulse(){
62-
if(stream){
63-
pa_stream_disconnect(stream);
64-
pa_stream_unref(stream);
65-
}
68+
return stream;
6669
}
6770

6871
void AudioOutputPulse::Start(){
@@ -94,7 +97,9 @@ void AudioOutputPulse::SetCurrentDevice(std::string devID){
9497
currentDevice=devID;
9598
if(isPlaying && isConnected){
9699
pa_stream_disconnect(stream);
100+
pa_stream_unref(stream);
97101
isConnected=false;
102+
stream=CreateAndInitStream();
98103
}
99104

100105
pa_buffer_attr bufferAttr={

‎os/linux/AudioOutputPulse.h

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class AudioOutputPulse : public AudioOutput{
2828
static void StreamStateCallback(pa_stream* s, void* arg);
2929
static void StreamWriteCallback(pa_stream* stream, size_t requested_bytes, void* userdata);
3030
void StreamWriteCallback(pa_stream* stream, size_t requestedBytes);
31+
pa_stream* CreateAndInitStream();
3132

3233
pa_threaded_mainloop* mainloop;
3334
pa_context* context;

‎os/windows/AudioInputWASAPI.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ AudioInputWASAPI::AudioInputWASAPI(std::string deviceID){
3131
refCount=1;
3232
HRESULT res;
3333
res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
34-
CHECK_RES(res, "CoInitializeEx");
34+
if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
35+
CHECK_RES(res, "CoInitializeEx");
36+
}
3537
#ifdef TGVOIP_WINXP_COMPAT
3638
HANDLE (WINAPI *__CreateEventExA)(LPSECURITY_ATTRIBUTES lpEventAttributes, LPCSTR lpName, DWORD dwFlags, DWORD dwDesiredAccess);
3739
__CreateEventExA=(HANDLE (WINAPI *)(LPSECURITY_ATTRIBUTES, LPCSTR, DWORD, DWORD))GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateEventExA");
@@ -124,7 +126,9 @@ void AudioInputWASAPI::EnumerateDevices(std::vector<tgvoip::AudioInputDevice>& d
124126
#ifdef TGVOIP_WINDOWS_DESKTOP
125127
HRESULT res;
126128
res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
127-
SCHECK_RES(res, "CoInitializeEx");
129+
if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
130+
SCHECK_RES(res, "CoInitializeEx");
131+
}
128132

129133
IMMDeviceEnumerator *deviceEnumerator = NULL;
130134
IMMDeviceCollection *deviceCollection = NULL;

‎os/windows/AudioInputWASAPI.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class AudioInputWASAPI : public AudioInput{
6464
HANDLE audioSamplesReadyEvent;
6565
HANDLE streamSwitchEvent;
6666
HANDLE thread;
67-
IAudioClient* audioClient;
68-
IAudioCaptureClient* captureClient;
67+
IAudioClient* audioClient=NULL;
68+
IAudioCaptureClient* captureClient=NULL;
6969
#ifdef TGVOIP_WINDOWS_DESKTOP
7070
IMMDeviceEnumerator* enumerator;
7171
IAudioSessionControl* audioSessionControl;

‎os/windows/AudioOutputWASAPI.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ AudioOutputWASAPI::AudioOutputWASAPI(std::string deviceID){
3535
refCount=1;
3636
HRESULT res;
3737
res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
38-
CHECK_RES(res, "CoInitializeEx");
38+
if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
39+
CHECK_RES(res, "CoInitializeEx");
40+
}
3941
#ifdef TGVOIP_WINXP_COMPAT
4042
HANDLE (WINAPI *__CreateEventExA)(LPSECURITY_ATTRIBUTES lpEventAttributes, LPCSTR lpName, DWORD dwFlags, DWORD dwDesiredAccess);
4143
__CreateEventExA=(HANDLE (WINAPI *)(LPSECURITY_ATTRIBUTES, LPCSTR, DWORD, DWORD))GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateEventExA");
@@ -120,7 +122,9 @@ void AudioOutputWASAPI::EnumerateDevices(std::vector<tgvoip::AudioOutputDevice>&
120122
#ifdef TGVOIP_WINDOWS_DESKTOP
121123
HRESULT res;
122124
res=CoInitializeEx(NULL, COINIT_MULTITHREADED);
123-
SCHECK_RES(res, "CoInitializeEx");
125+
if(FAILED(res) && res!=RPC_E_CHANGED_MODE){
126+
SCHECK_RES(res, "CoInitializeEx");
127+
}
124128

125129
IMMDeviceEnumerator *deviceEnumerator = NULL;
126130
IMMDeviceCollection *deviceCollection = NULL;

‎os/windows/AudioOutputWASAPI.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ class AudioOutputWASAPI : public AudioOutput{
6363
HANDLE audioSamplesReadyEvent;
6464
HANDLE streamSwitchEvent;
6565
HANDLE thread;
66-
IAudioClient* audioClient;
67-
IAudioRenderClient* renderClient;
66+
IAudioClient* audioClient=NULL;
67+
IAudioRenderClient* renderClient=NULL;
6868
#ifdef TGVOIP_WINDOWS_DESKTOP
6969
IMMDeviceEnumerator* enumerator;
7070
IAudioSessionControl* audioSessionControl;

0 commit comments

Comments
 (0)