Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-12-24 17:53:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Tox/toxic

Browse Source
This commit is contained in:
Jfreegman 2014-04-07 06:04:15 -04:00
commit e17b62c98b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/audio_call.c
View File

@ -24,6 +24,8 @@
#define MAX_DEVICES 32 #define MAX_DEVICES 32
#define _cbend pthread_exit(NULL) #define _cbend pthread_exit(NULL)
#define AUDIO_FRAME_SIZE (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000)
typedef struct _DeviceIx { typedef struct _DeviceIx {
ALCdevice* dhndl; /* Handle of device selected/opened */ ALCdevice* dhndl; /* Handle of device selected/opened */
@ -86,7 +88,10 @@ int device_open (ToxWindow *self, _Devices type)
if ( type == input ) { if ( type == input ) {
ASettins.device[type].dhndl = alcCaptureOpenDevice( ASettins.device[type].dhndl = alcCaptureOpenDevice(
ASettins.device[type].devices[ASettins.device[type].index], AUDIO_SAMPLE_RATE, AL_FORMAT_MONO16, AUDIO_FRAME_SIZE * 4); ASettins.device[type].devices[ASettins.device[type].index],
av_DefaultSettings.audio_sample_rate,
AL_FORMAT_MONO16,
AUDIO_FRAME_SIZE * 4);
if (alcGetError(ASettins.device[type].dhndl) != AL_NO_ERROR) { if (alcGetError(ASettins.device[type].dhndl) != AL_NO_ERROR) {
@ -241,7 +246,11 @@ ToxAv* init_audio(ToxWindow* self, Tox* tox)
} }
else { else {
/* Streaming stuff from core */ /* Streaming stuff from core */
ASettins.av = toxav_new(tox, 0, 0);
ToxAvCodecSettings cs = av_DefaultSettings;
cs.video_height = cs.video_width = 0;
ASettins.av = toxav_new(tox, &cs);
if ( !ASettins.av ) { if ( !ASettins.av ) {
ASettins.errors |= ErrorStartingCoreAudio; ASettins.errors |= ErrorStartingCoreAudio;