external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 11:21:52 +00:00
Code Issues Releases Wiki Activity

For #1634, refactor encoder process management.

Browse source
This commit is contained in:
winlin 2020-03-11 19:08:36 +08:00
parent 927c0c8e39
commit 66b194cd63
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
trunk/src/app/srs_app_encoder.cpp
View file

@ -94,15 +94,17 @@ srs_error_t SrsEncoder::cycle()
srs_error_t err = srs_success;
while (true) {
if ((err = do_cycle()) != srs_success) {
srs_warn("Encoder: Ignore error, %s", srs_error_desc(err).c_str());
srs_error_reset(err);
}
// We always check status first.
// @see https://github.com/ossrs/srs/issues/1634#issuecomment-597571561
if ((err = trd->pull()) != srs_success) {
err = srs_error_wrap(err, "encoder");
break;
}
if ((err = do_cycle()) != srs_success) {
srs_warn("Encoder: Ignore error, %s", srs_error_desc(err).c_str());
srs_error_reset(err);
}
srs_usleep(SRS_RTMP_ENCODER_CIMS);
}