mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge 4.0release, migrate to new website.
This commit is contained in:
commit
f7280399d4
79 changed files with 629 additions and 715 deletions
|
@ -740,11 +740,11 @@ public:
|
|||
// Get the transformed vhost for edge,
|
||||
virtual std::string get_vhost_edge_transform_vhost(std::string vhost);
|
||||
// Whether enable the origin cluster.
|
||||
// @see https://github.com/ossrs/srs/wiki/v3_EN_OriginCluster
|
||||
// @see https://ossrs.net/lts/zh-cn/docs/v4/doc/origin-cluster
|
||||
virtual bool get_vhost_origin_cluster(std::string vhost);
|
||||
virtual bool get_vhost_origin_cluster(SrsConfDirective* conf);
|
||||
// Get the co-workers of origin cluster.
|
||||
// @see https://github.com/ossrs/srs/wiki/v3_EN_OriginCluster
|
||||
// @see https://ossrs.net/lts/zh-cn/docs/v4/doc/origin-cluster
|
||||
virtual std::vector<std::string> get_vhost_coworkers(std::string vhost);
|
||||
// vhost security section
|
||||
public:
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
// When reload callback, the config is updated yet.
|
||||
//
|
||||
// Features not support reload,
|
||||
// @see: https://github.com/ossrs/srs/wiki/v1_CN_Reload#notsupportedfeatures
|
||||
// @see: https://ossrs.net/lts/zh-cn/docs/v4/doc/reload#notsupportedfeatures
|
||||
class ISrsReloadHandler
|
||||
{
|
||||
public:
|
||||
|
|
|
@ -287,7 +287,7 @@ srs_error_t SrsRtmpFromSrtBridge::on_packet(SrsSrtPacket *pkt)
|
|||
SrsAutoFree(SrsBuffer, stream);
|
||||
|
||||
// Process each ts packet. Note that the jitter of UDP may cause video glitch when packet loss or wrong seq. We
|
||||
// don't handle it because SRT will, see tlpkdrop at https://github.com/ossrs/srs/wiki/v5_EN_SRTParams
|
||||
// don't handle it because SRT will, see tlpkdrop at https://ossrs.net/lts/zh-cn/docs/v4/doc/srt-params
|
||||
if ((err = ts_ctx_->decode(stream, this)) != srs_success) {
|
||||
srs_warn("parse ts packet err=%s", srs_error_desc(err).c_str());
|
||||
srs_error_reset(err);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue