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

Merge pull request #1951 from jpark37/audio-buffering 

Fix audio buffering for devices like GV-USB2
master
Jim 2019-07-20 17:05:27 -07:00 committed by GitHub
parent 15770712a8 da87f08da4
commit ffcfe4c9d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libobs/obs-audio.c
View File

@ -211,6 +211,7 @@ static inline void discard_audio(struct obs_core_audio *audio,
if (is_audio_source)
blog(LOG_DEBUG, "can't discard, data still pending");
#endif
source->audio_ts = ts->end;
return;
}

5
libobs/obs-source.c
View File

@ -1269,8 +1269,11 @@ static void source_output_audio_data(obs_source_t *source,
if (diff > MAX_TS_VAR && !using_direct_ts)
handle_ts_jump(source, source->next_audio_ts_min,
in.timestamp, diff, os_time);
else if (diff < TS_SMOOTHING_THRESHOLD)
else if (diff < TS_SMOOTHING_THRESHOLD) {
if (source->async_unbuffered && source->async_decoupled)
source->timing_adjust = os_time - in.timestamp;
in.timestamp = source->next_audio_ts_min;
}
}
source->last_audio_ts = in.timestamp;

6
plugins/win-dshow/win-dshow.cpp
View File

@ -801,6 +801,11 @@ static inline bool IsEncoded(const VideoConfig &config)
wstrstri(config.name.c_str(), L"stream engine") != NULL;
}
static inline bool IsDecoupled(const VideoConfig &config)
{
return wstrstri(config.name.c_str(), L"GV-USB2") != NULL;
}
inline void DShowInput::SetupBuffering(obs_data_t *settings)
{
BufferingType bufType;
@ -814,6 +819,7 @@ inline void DShowInput::SetupBuffering(obs_data_t *settings)
useBuffering = bufType == BufferingType::On;
obs_source_set_async_unbuffered(source, !useBuffering);
obs_source_set_async_decoupled(source, IsDecoupled(videoConfig));
}
static DStr GetVideoFormatName(VideoFormat format);