sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed pasound.c to get the default sound devices from the host API's default sound device rather than relying on device ID zero for the default device [thanks Norman Franke] 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@759 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Benny Prijono 2006-10-09 21:09:51 +00:00
parent 4784d77264
commit 6d42358cb2
1 changed files with 112 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
pjmedia/src/pjmedia/pasound.c
View File

@ -227,6 +227,85 @@ PJ_DEF(const pjmedia_snd_dev_info*) pjmedia_snd_get_dev_info(unsigned index)
} }
/* Get PortAudio default input device ID */
static int pa_get_default_input_dev(int channel_count)
{
int i, count;
/* Enumerate the host api's for the default devices, and return
* the device with suitable channels.
*/
count = Pa_GetHostApiCount();
for (i=0; i < count; ++i) {
const PaHostApiInfo *pHAInfo;
pHAInfo = Pa_GetHostApiInfo(i);
if (!pHAInfo)
continue;
if (pHAInfo->defaultInputDevice >= 0) {
const PaDeviceInfo *paDevInfo;
paDevInfo = Pa_GetDeviceInfo(pHAInfo->defaultInputDevice);
if (paDevInfo->maxInputChannels >= channel_count)
return pHAInfo->defaultInputDevice;
}
}
/* If still no device is found, enumerate all devices */
count = Pa_GetDeviceCount();
for (i=0; i<count; ++i) {
const PaDeviceInfo *paDevInfo;
paDevInfo = Pa_GetDeviceInfo(i);
if (paDevInfo->maxInputChannels >= channel_count)
return i;
}
return -1;
}
/* Get PortAudio default output device ID */
static int pa_get_default_output_dev(int channel_count)
{
int i, count;
/* Enumerate the host api's for the default devices, and return
* the device with suitable channels.
*/
count = Pa_GetHostApiCount();
for (i=0; i < count; ++i) {
const PaHostApiInfo *pHAInfo;
pHAInfo = Pa_GetHostApiInfo(i);
if (!pHAInfo)
continue;
if (pHAInfo->defaultOutputDevice >= 0) {
const PaDeviceInfo *paDevInfo;
paDevInfo = Pa_GetDeviceInfo(pHAInfo->defaultOutputDevice);
if (paDevInfo->maxOutputChannels >= channel_count)
return pHAInfo->defaultOutputDevice;
}
}
/* If still no device is found, enumerate all devices */
count = Pa_GetDeviceCount();
for (i=0; i<count; ++i) {
const PaDeviceInfo *paDevInfo;
paDevInfo = Pa_GetDeviceInfo(i);
if (paDevInfo->maxOutputChannels >= channel_count)
return i;
}
return -1;
}
/* /*
* Open stream. * Open stream.
*/ */
@ -250,22 +329,17 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_rec( int index,
PaError err; PaError err;
if (index <= 0) { if (index <= 0) {
int count = Pa_GetDeviceCount(); index = pa_get_default_input_dev(channel_count);
for (index=0; index<count; ++index) { if (index < 0) {
paDevInfo = Pa_GetDeviceInfo(index);
if (paDevInfo->maxInputChannels >= (int)channel_count)
break;
}
if (index == count) {
/* No such device. */ /* No such device. */
return PJMEDIA_ENOSNDREC; return PJMEDIA_ENOSNDREC;
} }
} else { }
paDevInfo = Pa_GetDeviceInfo(index);
if (!paDevInfo) { paDevInfo = Pa_GetDeviceInfo(index);
/* Assumed it is "No such device" error. */ if (!paDevInfo) {
return PJMEDIA_ESNDINDEVID; /* Assumed it is "No such device" error. */
} return PJMEDIA_ESNDINDEVID;
} }
if (bits_per_sample == 8) if (bits_per_sample == 8)
@ -351,22 +425,17 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_player( int index,
PaError err; PaError err;
if (index <= 0) { if (index <= 0) {
int count = Pa_GetDeviceCount(); index = pa_get_default_output_dev(channel_count);
for (index=0; index<count; ++index) { if (index < 0) {
paDevInfo = Pa_GetDeviceInfo(index);
if (paDevInfo->maxOutputChannels >= (int)channel_count)
break;
}
if (index == count) {
/* No such device. */ /* No such device. */
return PJMEDIA_ENOSNDPLAY; return PJMEDIA_ENOSNDPLAY;
} }
} else { }
paDevInfo = Pa_GetDeviceInfo(index);
if (!paDevInfo) { paDevInfo = Pa_GetDeviceInfo(index);
/* Assumed it is "No such device" error. */ if (!paDevInfo) {
return PJMEDIA_ESNDINDEVID; /* Assumed it is "No such device" error. */
} return PJMEDIA_ESNDINDEVID;
} }
if (bits_per_sample == 8) if (bits_per_sample == 8)
@ -460,43 +529,34 @@ PJ_DEF(pj_status_t) pjmedia_snd_open( int rec_id,
PaError err; PaError err;
if (rec_id <= 0) { if (rec_id <= 0) {
int count = Pa_GetDeviceCount(); rec_id = pa_get_default_input_dev(channel_count);
for (rec_id=0; rec_id<count; ++rec_id) { if (rec_id < 0) {
paRecDevInfo = Pa_GetDeviceInfo(rec_id);
if (paRecDevInfo->maxInputChannels >= (int)channel_count)
break;
}
if (rec_id == count) {
/* No such device. */ /* No such device. */
return PJMEDIA_ENOSNDREC; return PJMEDIA_ENOSNDREC;
} }
} else { }
paRecDevInfo = Pa_GetDeviceInfo(rec_id);
if (!paRecDevInfo) { paRecDevInfo = Pa_GetDeviceInfo(rec_id);
/* Assumed it is "No such device" error. */ if (!paRecDevInfo) {
return PJMEDIA_ESNDINDEVID; /* Assumed it is "No such device" error. */
} return PJMEDIA_ESNDINDEVID;
} }
if (play_id <= 0) { if (play_id <= 0) {
int count = Pa_GetDeviceCount(); play_id = pa_get_default_output_dev(channel_count);
for (play_id=0; play_id<count; ++play_id) { if (play_id < 0) {
paPlayDevInfo = Pa_GetDeviceInfo(play_id);
if (paPlayDevInfo->maxOutputChannels >= (int)channel_count)
break;
}
if (play_id == count) {
/* No such device. */ /* No such device. */
return PJMEDIA_ENOSNDPLAY; return PJMEDIA_ENOSNDPLAY;
} }
} else { }
paPlayDevInfo = Pa_GetDeviceInfo(play_id);
if (!paPlayDevInfo) { paPlayDevInfo = Pa_GetDeviceInfo(play_id);
/* Assumed it is "No such device" error. */ if (!paPlayDevInfo) {
return PJMEDIA_ESNDINDEVID; /* Assumed it is "No such device" error. */
} return PJMEDIA_ESNDINDEVID;
} }
if (bits_per_sample == 8) if (bits_per_sample == 8)
sampleFormat = paUInt8; sampleFormat = paUInt8;
else if (bits_per_sample == 16) else if (bits_per_sample == 16)