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

Squash: Merge SRS4.0

This commit is contained in:
winlin 2021-09-07 08:20:43 +08:00
parent 8aee0169ce
commit a830289d97
3 changed files with 17 additions and 7 deletions

View file

@ -755,8 +755,12 @@ srs_error_t SrsGoApiStreams::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa
if (!stream) {
SrsJsonArray* data = SrsJsonAny::array();
obj->set("streams", data);
if ((err = stat->dumps_streams(data)) != srs_success) {
std::string rstart = r->query_get("start");
std::string rcount = r->query_get("count");
int start = srs_max(0, atoi(rstart.c_str()));
int count = srs_max(10, atoi(rcount.c_str()));
if ((err = stat->dumps_streams(data, start, count)) != srs_success) {
int code = srs_error_code(err);
srs_error_reset(err);
return srs_api_response_code(w, r, code);