jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Add ability to configure audio buffering latency

Browse Source 
Allows a frontend the ability to set the maximum audio buffering
latency, and specify whether that audio buffering is either fixed (to
the maximum audio buffering latency), or dynamically increasing from 0.

This will be useful if the user wishes to output audio to devices or
through a virtual audio device at a guaranteed minimal latency.
This commit is contained in:
jp9000
2022-04-24 08:43:12 -07:00
parent 090613851e
commit f482111791
5 changed files with 84 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libobs/obs.c
View File

@@ -1395,18 +1395,37 @@ int obs_reset_video(struct obs_video_info *ovi)
return obs_init_video(ovi);
}
bool obs_reset_audio(const struct obs_audio_info *oai)
#ifndef SEC_TO_MSEC
#define SEC_TO_MSEC 1000
#endif
bool obs_reset_audio2(const struct obs_audio_info2 *oai)
{
struct obs_core_audio *audio = &obs->audio;
struct audio_output_info ai;
/* don't allow changing of audio settings if active. */
if (obs->audio.audio && audio_output_active(obs->audio.audio))
if (!obs || (audio->audio && audio_output_active(audio->audio)))
return false;
obs_free_audio();
if (!oai)
return true;
if (oai->max_buffering_ms) {
uint32_t max_frames = oai->max_buffering_ms *
oai->samples_per_sec / SEC_TO_MSEC;
max_frames += (AUDIO_OUTPUT_FRAMES - 1);
audio->max_buffering_ticks = max_frames / AUDIO_OUTPUT_FRAMES;
} else {
audio->max_buffering_ticks = 45;
}
audio->fixed_buffer = oai->fixed_buffering;
int max_buffering_ms = audio->max_buffering_ticks *
AUDIO_OUTPUT_FRAMES * SEC_TO_MSEC /
(int)oai->samples_per_sec;
ai.name = "Audio";
ai.samples_per_sec = oai->samples_per_sec;
ai.format = AUDIO_FORMAT_FLOAT_PLANAR;
@@ -1417,12 +1436,25 @@ bool obs_reset_audio(const struct obs_audio_info *oai)
blog(LOG_INFO,
"audio settings reset:\n"
"\tsamples per sec: %d\n"
"\tspeakers: %d",
(int)ai.samples_per_sec, (int)ai.speakers);
"\tspeakers: %d\n"
"\tmax buffering: %d milliseconds\n"
"\tbuffering type: %s",
(int)ai.samples_per_sec, (int)ai.speakers, max_buffering_ms,
oai->fixed_buffering ? "fixed" : "dynamically increasing");
return obs_init_audio(&ai);
}
bool obs_reset_audio(const struct obs_audio_info *oai)
{
struct obs_audio_info2 oai2 = {
.samples_per_sec = oai->samples_per_sec,
.speakers = oai->speakers,
};
return obs_reset_audio2(&oai2);
}
bool obs_get_video_info(struct obs_video_info *ovi)
{
struct obs_core_video *video = &obs->video;