OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Fix bug where scenes would not properly mix audio

Browse source
This commit is contained in:
jp9000 2017-02-26 08:17:14 -08:00
parent 4c2fac8e4c
commit a5828610bb
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libobs/obs-scene.c
View file

@ -883,7 +883,7 @@ static bool scene_audio_render(void *data, uint64_t *ts_out,
uint64_t source_ts =
obs_source_get_audio_timestamp(item->source);
if (!timestamp || source_ts < timestamp)
if (source_ts && (!timestamp || source_ts < timestamp))
timestamp = source_ts;
}
@ -918,6 +918,11 @@ static bool scene_audio_render(void *data, uint64_t *ts_out,
}
source_ts = obs_source_get_audio_timestamp(item->source);
if (!source_ts) {
item = item->next;
continue;
}
pos = (size_t)ns_to_audio_frames(sample_rate,
source_ts - timestamp);
count = AUDIO_OUTPUT_FRAMES - pos;