HLS: Stat the HLS streaming clients bandwidth. v5.0.49

trunk/doc/CHANGELOG.md

@@ -7,6 +7,7 @@ The changelog for SRS.
 
 ## SRS 5.0 Changelog
 
+* v5.0, 2022-08-29, HLS: Stat the HLS streaming clients bandwidth. v5.0.49
 * v5.0, 2022-08-28, URL: Use SrsHttpUri to parse URL and query. v5.0.48
 * v5.0, 2022-08-28, Fix [#2881](https://github.com/ossrs/srs/issues/2881): HTTP: Support merging api to server. v5.0.47
 * v5.0, 2022-08-27, Fix [#3108](https://github.com/ossrs/srs/issues/3108): STAT: Update stat for SRT. v5.0.46

trunk/src/app/srs_app_http_static.cpp

@@ -86,11 +86,31 @@ srs_error_t SrsHlsStream::serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMess
  return serve_new_session(w, r, req);
 }
 
+void SrsHlsStream::on_serve_ts_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
+{
+ string ctx = r->query_get(SRS_CONTEXT_IN_HLS);
+ if (ctx.empty() || !ctx_is_exist(ctx)) {
+ return;
+ }
+
+ SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
+ srs_assert(hr);
+
+ SrsHttpConn* hc = dynamic_cast<SrsHttpConn*>(hr->connection());
+ srs_assert(hc);
+
+ ISrsKbpsDelta* conn = dynamic_cast<ISrsKbpsDelta*>(hc);
+ srs_assert(conn);
+
+ // Only update the delta, because SrsServer will sample it.
+ SrsStatistic::instance()->kbps_add_delta(ctx, conn);
+}
+
 srs_error_t SrsHlsStream::serve_new_session(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, SrsRequest* req)
 {
  srs_error_t err = srs_success;
 
- SrsHttpMessage *hr = dynamic_cast<SrsHttpMessage *>(r);
+ SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
  srs_assert(hr);
 
  string ctx;
@@ -445,14 +465,14 @@ srs_error_t SrsVodStream::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMes
 {
  srs_error_t err = srs_success;
 
- SrsHttpMessage *hr = dynamic_cast<SrsHttpMessage *>(r);
+ SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
  srs_assert(hr);
 
- SrsRequest *req = hr->to_request(hr->host())->as_http();
+ SrsRequest* req = hr->to_request(hr->host())->as_http();
  SrsAutoFree(SrsRequest, req);
 
  // discovery vhost, resolve the vhost from config
- SrsConfDirective *parsed_vhost = _srs_config->get_vhost(req->vhost);
+ SrsConfDirective* parsed_vhost = _srs_config->get_vhost(req->vhost);
  if (parsed_vhost) {
  req->vhost = parsed_vhost->arg0();
  }
@@ -467,6 +487,31 @@ srs_error_t SrsVodStream::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMes
  return hls_.serve_m3u8_ctx(w, r, fullpath, req);
 }
 
+srs_error_t SrsVodStream::serve_ts_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ srs_error_t err = srs_success;
+
+ SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
+ srs_assert(hr);
+
+ SrsRequest* req = hr->to_request(hr->host())->as_http();
+ SrsAutoFree(SrsRequest, req);
+
+ // discovery vhost, resolve the vhost from config
+ SrsConfDirective* parsed_vhost = _srs_config->get_vhost(req->vhost);
+ if (parsed_vhost) {
+ req->vhost = parsed_vhost->arg0();
+ }
+
+ // Serve by default HLS handler.
+ err = SrsHttpFileServer::serve_ts_ctx(w, r, fullpath);
+
+ // Notify the HLS to stat the ts after serving.
+ hls_.on_serve_ts_ctx(w, r);
+
+ return err;
+}
+
 SrsHttpStaticServer::SrsHttpStaticServer(SrsServer* svr)
 {
  server = svr;

trunk/src/app/srs_app_http_static.hpp

@@ -30,6 +30,7 @@ class SrsHlsStream : public ISrsFastTimer
  virtual ~SrsHlsStream();
 public:
  virtual srs_error_t serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, SrsRequest* req);
+ virtual void on_serve_ts_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
 private:
  srs_error_t serve_new_session(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, SrsRequest *req);
  srs_error_t serve_exists_session(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
@@ -60,6 +61,7 @@ class SrsVodStream : public SrsHttpFileServer
  virtual srs_error_t serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int64_t start, int64_t end);
  // Support HLS streaming with pseudo session id.
  virtual srs_error_t serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
+ virtual srs_error_t serve_ts_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
 };
 
 // The http static server instance,

trunk/src/core/srs_core_version5.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 0
-#define VERSION_REVISION 48
+#define VERSION_REVISION 49
 
 #endif

trunk/src/protocol/srs_protocol_http_stack.cpp

@@ -382,6 +382,8 @@ srs_error_t SrsHttpFileServer::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMes
  return serve_mp4_file(w, r, fullpath);
  } else if (srs_string_ends_with(upath, ".m3u8")) {
  return serve_m3u8_file(w, r, fullpath);
+ } else if (srs_string_ends_with(upath, ".ts")) {
+ return serve_ts_file(w, r, fullpath);
  }
 
  // serve common static file.
@@ -531,6 +533,11 @@ srs_error_t SrsHttpFileServer::serve_m3u8_file(ISrsHttpResponseWriter * w, ISrsH
  return serve_m3u8_ctx(w, r, fullpath);
 }
 
+srs_error_t SrsHttpFileServer::serve_ts_file(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ return serve_ts_ctx(w, r, fullpath);
+}
+
 srs_error_t SrsHttpFileServer::serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, string fullpath, int64_t offset)
 {
  // @remark For common http file server, we don't support stream request, please use SrsVodStream instead.
@@ -548,7 +555,12 @@ srs_error_t SrsHttpFileServer::serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsH
 srs_error_t SrsHttpFileServer::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
 {
  // @remark For common http file server, we don't support stream request, please use SrsVodStream instead.
- // TODO: FIXME: Support range in header https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Range_requests
+ return serve_file(w, r, fullpath);
+}
+
+srs_error_t SrsHttpFileServer::serve_ts_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ // @remark For common http file server, we don't support stream request, please use SrsVodStream instead.
  return serve_file(w, r, fullpath);
 }
 

trunk/src/protocol/srs_protocol_http_stack.hpp

@@ -286,6 +286,7 @@ class SrsHttpFileServer : public ISrsHttpHandler
  virtual srs_error_t serve_flv_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
  virtual srs_error_t serve_mp4_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
  virtual srs_error_t serve_m3u8_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
+ virtual srs_error_t serve_ts_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
 protected:
  // When access flv file with x.flv?start=xxx
  virtual srs_error_t serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int64_t offset);
@@ -304,6 +305,7 @@ class SrsHttpFileServer : public ISrsHttpHandler
  // Remark 2:
  // If use two same "hls_ctx" in different requests, SRS cannot detect so that they will be treated as one.
  virtual srs_error_t serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
+ virtual srs_error_t serve_ts_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
 protected:
  // Copy the fs to response writer in size bytes.
  virtual srs_error_t copy(ISrsHttpResponseWriter* w, SrsFileReader* fs, ISrsHttpMessage* r, int64_t size);