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

libobs: Don't call discard_if_stopped if not minor data

Browse Source 
Only allow discard_if_stopped to be called if the audio data is marked
as pending, and the pending audio data is below the audio tick threshold
size.
This commit is contained in:
jp9000 2016-02-04 00:35:00 -08:00
parent cded9cb1ca
commit ac3b2a08ad
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-audio.c
View File

@ -125,6 +125,8 @@ static bool discard_if_stopped(obs_source_t *source, size_t channels)
}
}
#define MAX_AUDIO_SIZE (AUDIO_OUTPUT_FRAMES * sizeof(float))
static inline void discard_audio(struct obs_core_audio *audio,
obs_source_t *source, size_t channels, size_t sample_rate,
struct ts_info *ts)
@ -152,8 +154,11 @@ static inline void discard_audio(struct obs_core_audio *audio,
}
if (source->audio_ts < (ts->start - 1)) {
if (discard_if_stopped(source, channels))
if (source->audio_pending &&
source->audio_input_buf[0].size < MAX_AUDIO_SIZE &&
discard_if_stopped(source, channels))
return;
#if DEBUG_AUDIO == 1
if (is_audio_source) {
blog(LOG_DEBUG, "can't discard, source "