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

obs-ffmpeg: Fix AMF encoder lockup with older AMD cards 

This goes back to a slightly older variant of the
SubmitInput/QueryOutput handling that doesn't use AMF's timeout
property. Older devices do not like it when you change the query timeout
on the fly and will lock up. So instead, wait one millisecond when the
AMF input is full, which appears to fix the issue according to testers.

Also adds a loop timeout in case it goes in an infinite loop (which it
shouldn't anymore, but still)

Big thanks to Flaeri for testing the old code, and Yukari for patiently
testing a whole bunch of builds.
master
jp9000 2022-08-22 10:09:19 -07:00
parent a6c2bb1294
commit 6dc8897e79
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/obs-ffmpeg/texture-amf.cpp
View File

@ -95,7 +95,6 @@ struct amf_base {
AMFBufferPtr header;
std::deque<AMFDataPtr> queued_packets;
int last_query_timeout_ms = 0;
AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM amf_color_profile;
AMF_COLOR_TRANSFER_CHARACTERISTIC_ENUM amf_characteristic;
@ -500,6 +499,10 @@ static void convert_to_encoder_packet(amf_base *enc, AMFDataPtr &data,
}
}
#ifndef SEC_TO_NSEC
#define SEC_TO_NSEC 1000000000ULL
#endif
static void amf_encode_base(amf_base *enc, AMFSurface *amf_surf,
encoder_packet *packet, bool *received_packet)
{
@ -515,23 +518,23 @@ static void amf_encode_base(amf_base *enc, AMFSurface *amf_surf,
/* submit frame */
res = enc->amf_encoder->SubmitInput(amf_surf);
int timeout = 0;
if (res == AMF_OK || res == AMF_NEED_MORE_INPUT) {
waiting = false;
} else if (res == AMF_INPUT_FULL) {
timeout = 1;
os_sleep_ms(1);
uint64_t duration = os_gettime_ns() - ts_start;
constexpr uint64_t timeout = 5 * SEC_TO_NSEC;
if (duration >= timeout) {
throw amf_error("SubmitInput timed out", res);
}
} else {
throw amf_error("SubmitInput failed", res);
}
if (enc->last_query_timeout_ms != timeout) {
set_opt(QUERY_TIMEOUT, timeout);
enc->last_query_timeout_ms = timeout;
}
/* ----------------------------------- */
/* query as many packets as possible */