starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 07:25:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #276 from reboot/fix_pulse_audio_format_conversion

Browse Source 
Fix pulse audio format conversion
This commit is contained in:
Jim
2014-10-10 17:02:00 -07:00
parent 9183c827c5 ed1430622b
commit e7d5ad257b
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/linux-pulseaudio/pulse-input.c
+17 -8
View File
@@ -58,7 +58,7 @@ static enum audio_format pulse_to_obs_audio_format(
switch (format) {
case PA_SAMPLE_U8: return AUDIO_FORMAT_U8BIT;
case PA_SAMPLE_S16LE: return AUDIO_FORMAT_16BIT;
case PA_SAMPLE_S24_32LE: return AUDIO_FORMAT_32BIT;
case PA_SAMPLE_S32LE: return AUDIO_FORMAT_32BIT;
case PA_SAMPLE_FLOAT32LE: return AUDIO_FORMAT_FLOAT;
default: return AUDIO_FORMAT_UNKNOWN;
}
@@ -183,16 +183,25 @@ static void pulse_source_info(pa_context *c, const pa_source_info *i, int eol,
if (eol != 0)
goto skip;
data->format = i->sample_spec.format;
blog(LOG_INFO, "Audio format: %s, %"PRIu32" Hz"
", %"PRIu8" channels",
pa_sample_format_to_string(i->sample_spec.format),
i->sample_spec.rate,
i->sample_spec.channels);
pa_sample_format_t format = i->sample_spec.format;
if (pulse_to_obs_audio_format(format) == AUDIO_FORMAT_UNKNOWN) {
format = PA_SAMPLE_S16LE;
blog(LOG_INFO, "Sample format %s not supported by OBS, using %s instead for recording",
pa_sample_format_to_string(i->sample_spec.format),
pa_sample_format_to_string(format));
}
data->format = format;
data->samples_per_sec = i->sample_spec.rate;
data->channels = i->sample_spec.channels;
blog(LOG_INFO, "Audio format: %s, %"PRIuFAST32" Hz"
", %"PRIuFAST8" channels",
pa_sample_format_to_string(data->format),
data->samples_per_sec,
data->channels);
skip:
pulse_signal(0);
}