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

Merge 4.0release

Browse source
This commit is contained in:
winlin 2022-08-24 19:26:47 +08:00
commit 18d25eacfb
3 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -137,6 +137,7 @@ but some third-party libraries are distributed using their [own licenses](https:
## Releases ## Releases
* 2022-08-24, Release [v4.0-r2](https://github.com/ossrs/srs/releases/tag/v4.0-r2), v4.0-r2, 4.0 release2, v4.0.257, 144890 lines.
* 2022-06-29, Release [v4.0-r1](https://github.com/ossrs/srs/releases/tag/v4.0-r1), v4.0-r1, 4.0 release1, v4.0.253, 144680 lines. * 2022-06-29, Release [v4.0-r1](https://github.com/ossrs/srs/releases/tag/v4.0-r1), v4.0-r1, 4.0 release1, v4.0.253, 144680 lines.
* 2022-06-11, Release [v4.0-r0](https://github.com/ossrs/srs/releases/tag/v4.0-r0), v4.0-r0, 4.0 release0, v4.0.252, 144680 lines. * 2022-06-11, Release [v4.0-r0](https://github.com/ossrs/srs/releases/tag/v4.0-r0), v4.0-r0, 4.0 release0, v4.0.252, 144680 lines.
* 2022-03-19, Release [v4.0-b10](https://github.com/ossrs/srs/releases/tag/v4.0-b10), v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines. * 2022-03-19, Release [v4.0-b10](https://github.com/ossrs/srs/releases/tag/v4.0-b10), v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines.

16
trunk/conf/full.conf
View file

@ -1194,7 +1194,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_connect", # "action": "on_connect",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a", # "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a",
# "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty" # "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty"
@ -1211,7 +1211,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_close", # "action": "on_close",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "send_bytes": 10240, "recv_bytes": 10240, "server_id": "vid-werty" # "send_bytes": 10240, "recv_bytes": 10240, "server_id": "vid-werty"
# } # }
@ -1227,7 +1227,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_publish", # "action": "on_publish",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
# } # }
@ -1243,7 +1243,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_unpublish", # "action": "on_unpublish",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
# } # }
@ -1259,7 +1259,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_play", # "action": "on_play",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", # "stream": "livestream", "param":"?token=xxx&salt=yyy",
# "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty" # "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty"
@ -1276,7 +1276,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_stop", # "action": "on_stop",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty" # "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
# } # }
@ -1292,7 +1292,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_dvr", # "action": "on_dvr",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", # "stream": "livestream", "param":"?token=xxx&salt=yyy",
# "cwd": "/usr/local/srs", # "cwd": "/usr/local/srs",
@ -1306,7 +1306,7 @@ vhost hooks.callback.srs.com {
# the request in the POST data string is a object encode by json: # the request in the POST data string is a object encode by json:
# { # {
# "action": "on_hls", # "action": "on_hls",
# "client_id": 1985, # "client_id": "9308h583",
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", # "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
# "stream": "livestream", "param":"?token=xxx&salt=yyy", # "stream": "livestream", "param":"?token=xxx&salt=yyy",
# "duration": 9.36, // in seconds # "duration": 9.36, // in seconds

16
trunk/research/api-server/server.py
View file

@ -70,7 +70,7 @@ class RESTClients(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_connect", "action": "on_connect",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a", "tcUrl": "rtmp://video.test.com/live?key=d2fa801d08e3f90ed1e1670e6e52651a",
"pageUrl": "http://www.test.com/live.html" "pageUrl": "http://www.test.com/live.html"
@ -80,7 +80,7 @@ class RESTClients(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_close", "action": "on_close",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"send_bytes": 10240, "recv_bytes": 10240 "send_bytes": 10240, "recv_bytes": 10240
} }
@ -158,7 +158,7 @@ class RESTStreams(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_publish", "action": "on_publish",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"stream": "livestream", "param":"?token=xxx&salt=yyy" "stream": "livestream", "param":"?token=xxx&salt=yyy"
} }
@ -167,7 +167,7 @@ class RESTStreams(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_unpublish", "action": "on_unpublish",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"stream": "livestream", "param":"?token=xxx&salt=yyy" "stream": "livestream", "param":"?token=xxx&salt=yyy"
} }
@ -245,7 +245,7 @@ class RESTDvrs(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_dvr", "action": "on_dvr",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"stream": "livestream", "param":"?token=xxx&salt=yyy", "stream": "livestream", "param":"?token=xxx&salt=yyy",
"cwd": "/usr/local/srs", "cwd": "/usr/local/srs",
@ -364,7 +364,7 @@ class RESTHls(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_dvr", "action": "on_dvr",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "ip": "192.168.1.10",
"vhost": "video.test.com", "vhost": "video.test.com",
"app": "live", "app": "live",
@ -436,7 +436,7 @@ class RESTSessions(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_play", "action": "on_play",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"stream": "livestream", "param":"?token=xxx&salt=yyy", "stream": "livestream", "param":"?token=xxx&salt=yyy",
"pageUrl": "http://www.test.com/live.html" "pageUrl": "http://www.test.com/live.html"
@ -446,7 +446,7 @@ class RESTSessions(object):
the request in the POST data string is a object encode by json: the request in the POST data string is a object encode by json:
{ {
"action": "on_stop", "action": "on_stop",
"client_id": 1985, "client_id": "9308h583",
"ip": "192.168.1.10", "vhost": "video.test.com", "app": "live", "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
"stream": "livestream", "param":"?token=xxx&salt=yyy" "stream": "livestream", "param":"?token=xxx&salt=yyy"
} }