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

PushFLV: Fix bug, add stat

Browse source
This commit is contained in:
winlin 2021-09-17 14:20:35 +08:00
parent 5828d64a3d
commit 4456a275b6
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -96,8 +96,9 @@ void SrsAppCasterFlv::remove(ISrsResource* c)
srs_error_t SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) srs_error_t SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
{ {
SrsHttpMessage* msg = dynamic_cast<SrsHttpMessage*>(r); SrsHttpMessage* msg = dynamic_cast<SrsHttpMessage*>(r);
SrsDynamicHttpConn* conn = dynamic_cast<SrsDynamicHttpConn*>(msg->connection()); SrsHttpConn* hconn = dynamic_cast<SrsHttpConn*>(msg->connection());
srs_assert(conn); SrsDynamicHttpConn* dconn = dynamic_cast<SrsDynamicHttpConn*>(hconn->handler());
srs_assert(dconn);
std::string app = srs_path_dirname(r->path()); std::string app = srs_path_dirname(r->path());
app = srs_string_trim_start(app, "/"); app = srs_string_trim_start(app, "/");
@ -116,7 +117,7 @@ srs_error_t SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa
o = o.substr(0, o.length() - 4); o = o.substr(0, o.length() - 4);
} }
srs_error_t err = conn->proxy(w, r, o); srs_error_t err = dconn->proxy(w, r, o);
if (err != srs_success) { if (err != srs_success) {
return srs_error_wrap(err, "proxy"); return srs_error_wrap(err, "proxy");
} }

4
trunk/src/app/srs_app_latest_version.cpp
View file

@ -68,6 +68,7 @@ void srs_build_features(stringstream& ss)
int nn_vhosts = 0; int nn_vhosts = 0;
bool rtsp = false, forward = false, ingest = false, edge = false, hls = false, dvr = false, flv = false; bool rtsp = false, forward = false, ingest = false, edge = false, hls = false, dvr = false, flv = false;
bool hooks = false, dash = false, hds = false, exec = false, transcode = false, security = false; bool hooks = false, dash = false, hds = false, exec = false, transcode = false, security = false;
bool flv2 = false;
SrsConfDirective* root = _srs_config->get_root(); SrsConfDirective* root = _srs_config->get_root();
// Note that we limit the loop, never detect all configs. // Note that we limit the loop, never detect all configs.
@ -78,6 +79,8 @@ void srs_build_features(stringstream& ss)
string engine = _srs_config->get_stream_caster_engine(conf); string engine = _srs_config->get_stream_caster_engine(conf);
if (engine == "rtsp") { if (engine == "rtsp") {
rtsp = true; rtsp = true;
} else if (engine == "flv") {
flv2 = true;
} }
} }
@ -134,6 +137,7 @@ void srs_build_features(stringstream& ss)
SRS_CHECK_FEATURE2(nn_vhosts, "vhosts", ss); SRS_CHECK_FEATURE2(nn_vhosts, "vhosts", ss);
SRS_CHECK_FEATURE(rtsp, ss); SRS_CHECK_FEATURE(rtsp, ss);
SRS_CHECK_FEATURE(flv2, ss);
SRS_CHECK_FEATURE(forward, ss); SRS_CHECK_FEATURE(forward, ss);
SRS_CHECK_FEATURE(ingest, ss); SRS_CHECK_FEATURE(ingest, ss);
SRS_CHECK_FEATURE(edge, ss); SRS_CHECK_FEATURE(edge, ss);