external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #913, APP support complex error.

Browse source
This commit is contained in:
winlin 2018-01-01 21:20:57 +08:00
parent 6eae93258a
commit e2c1f58674
13 changed files with 423 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_hourglass.cpp
View file

@ -48,24 +48,22 @@ SrsHourGlass::~SrsHourGlass()
{
}
int SrsHourGlass::tick(int type, int interval)
srs_error_t SrsHourGlass::tick(int type, int interval)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (resolution > 0 && (interval % resolution) != 0) {
ret = ERROR_SYSTEM_HOURGLASS_RESOLUTION;
srs_error("hourglass interval=%d invalid, resolution=%d. ret=%d", interval, resolution, ret);
return ret;
return srs_error_new(ERROR_SYSTEM_HOURGLASS_RESOLUTION, "hourglass interval=%d invalid, resolution=%d", interval, resolution);
}
ticks[type] = interval;
return ret;
return err;
}
int SrsHourGlass::cycle()
srs_error_t SrsHourGlass::cycle()
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
map<int, int>::iterator it;
for (it = ticks.begin(); it != ticks.end(); ++it) {
@ -73,8 +71,8 @@ int SrsHourGlass::cycle()
int interval = it->second;
if (interval == 0 || (total_elapse % interval) == 0) {
if ((ret = handler->notify(type, interval, total_elapse)) != ERROR_SUCCESS) {
return ret;
if ((err = handler->notify(type, interval, total_elapse)) != srs_success) {
return srs_error_wrap(err, "notify");
}
}
}
@ -82,5 +80,5 @@ int SrsHourGlass::cycle()
total_elapse += resolution;
srs_usleep(resolution * 1000);
return ret;
return err;
}