opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-28 03:44:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

obs-ffmpeg: Fix unpause causing certain encoders to fail

Browse Source 
Due to the timeout detection, we need to factor in the current pause
offset to prevent pause from affecting the timeout.

Closes obsproject/obs-studio#7313
This commit is contained in:
jp9000
2022-09-30 13:09:29 -07:00
parent 4741a9aa50
commit 843fec57be
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/obs-ffmpeg/obs-ffmpeg-video-encoders.c
+3 -1
View File
@@ -221,6 +221,8 @@ bool ffmpeg_video_encode(struct ffmpeg_video_encoder *enc,
AVPacket av_pkt = {0};
bool timeout = false;
const int64_t cur_ts = (int64_t)os_gettime_ns();
const int64_t pause_offset =
(int64_t)obs_encoder_get_pause_offset(enc->encoder);
int got_packet;
int ret;
@@ -270,7 +272,7 @@ bool ffmpeg_video_encode(struct ffmpeg_video_encoder *enc,
debug("cur: %lld, packet: %lld, diff: %lld", cur_ts,
recv_ts_nsec, cur_ts - recv_ts_nsec);
#endif
if ((cur_ts - recv_ts_nsec) > TIMEOUT_MAX_NSEC) {
if ((cur_ts - recv_ts_nsec - pause_offset) > TIMEOUT_MAX_NSEC) {
char timeout_str[16];
snprintf(timeout_str, sizeof(timeout_str), "%d",
TIMEOUT_MAX_SEC);