external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
8514 commits 13 branches 107 tags 375 MiB
Commit graph

6644 commits

Author SHA1 Message Date
winlin
f9941a325b RTMP URL supports domain in stream parameters. v4.0.255 2022-08-17 11:08:32 +08:00
winlin
4126c42118 Speedup test by refine the task dependencies. 2022-08-15 07:57:42 +08:00
winlin
2d036c3fd6 Fix #2747: Support Apple Silicon M1(aarch64). v5.0.41 2022-08-14 22:46:54 +08:00
ChenGH
f2fa289fe8 AppleM1: Support Apple Silicon M1(aarch64). 2022-08-14 22:46:52 +08:00
winlin
b787656eea AppleM1: Update openssl to v1.1.1l 2022-08-14 22:46:51 +08:00
winlin
1fe12b8e8c Speedup test by using cache image. 2022-08-14 22:41:29 +08:00
winlin
d478d7b2ca Add test for crossbuild on Ubuntu20. 2022-08-12 20:12:13 +08:00
winlin
a842c6c32a Support crossbuild for hisiv500. v5.0.40 2022-08-12 17:41:15 +08:00
winlin
d885d574e4 Add files for reuse port for origins. 2022-08-12 17:40:57 +08:00
winlin
b73847de7d Refine configure for crossbuild. 2022-08-11 16:55:24 +08:00
winlin
7f7406ec77 Build: Detect OS by packager. v5.0.39 2022-08-10 23:20:14 +08:00
winlin
0227e44ef0 Fix warning for comparing int with sizeof. 2022-08-10 19:34:23 +08:00
winlin
26284e368f Merge branch '4.0release' into develop 2022-08-10 10:23:25 +08:00
winlin
febd45d514 Fix server id generator bug. v4.0.254 2022-08-10 10:20:47 +08:00
winlin
262b79f747 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.38 2022-08-10 08:35:39 +08:00
winlin
a71eddd56a Fix the snprintf size issue. 2022-08-10 08:32:02 +08:00
winlin
1ab584b2ae Loongson/mips64: Support FFmpeg and openssl. 2022-08-09 22:44:10 +08:00
winlin
0a025fc4b6 Remove unneccessary depends headers. 2022-08-09 18:32:01 +08:00
winlin
25c004e947 Opus: Add TODO because the audio might be corrupted, if use FFmpeg native opus. 2022-08-09 13:35:57 +08:00
winlin
f9e8065b51 Fix build warnings. 2022-08-09 08:27:08 +08:00
winlin
f44b694a17 For test docker image, use cache eventhough the kernel changed. v5.0.37 2022-08-09 08:27:01 +08:00
winlin
14832b66eb Build: Disable openssl ASM for loongson. v5.0.35 2022-08-08 20:33:27 +08:00
winlin
5ae495ab95 For #1229: Check the return value of vsnprintf. 2022-08-08 08:31:57 +08:00
winlin
079ac107f0 For loongarch, fix openssl build bug, always use linux64-mips64 as required. 2022-08-06 17:26:55 +08:00
winlin
1589858cb0 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.34 2022-08-06 13:03:45 +08:00
winlin
aba6667357 Refine build script. 2022-08-05 18:32:05 +08:00
winlin
2e4fe0aea9 Refine options, extract crossbuild from toolchain. 2022-08-05 18:24:46 +08:00
winlin
f7280399d4 Merge 4.0release, migrate to new website. 2022-07-31 18:34:18 +08:00
winlin
7b23a42139 Migrate license to new website. 2022-07-31 17:12:14 +08:00
winlin
d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 2022-07-31 16:26:35 +08:00
winlin
6c295952f6 RTMP: Fix unused variable warning. 2022-07-20 21:53:57 +08:00
Steven Liu
08c4b25030 RISCV: Patch ST and libsrtp. #3115 2022-07-20 21:53:39 +08:00
Steven Liu
8a6fa30992 app/srs_app_rtmp_conn: move err result to RTC MACRO to fix compiling warning 2022-07-18 13:50:10 +08:00
Steven Liu
ad2d7c3779 srtp-2-fit/config.guess: add riscv support 2022-07-18 13:46:59 +08:00
Steven Liu
ec7123d54c Support riscv, starfive CPU. 
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2022-07-16 16:52:24 +08:00
winlin
755a2a74ed Merge branch '4.0release' into develop 2022-07-02 14:18:49 +08:00
winlin
7d0d2af817 UTEST: Refine coverage script. 2022-07-02 14:04:26 +08:00
winlin
cd85a96255 Update SRS image for r.ossrs.net 2022-06-30 07:43:13 +08:00
winlin
0badae4797 Support thread pool and update ossrs.net. v5.0.33 2022-06-29 20:48:08 +08:00
winlin
57be5188c3 Merge branch '4.0release' into develop 2022-06-29 20:37:20 +08:00
winlin
a2cfec2dcc Update SRS image for r.ossrs.net 2022-06-29 20:36:35 +08:00
winlin
b2e083b00d Support multiple threads by thread pool. v5.0.32 2022-06-29 20:15:44 +08:00
winlin
7c6bd0ce5c Refine async DVR manager. 2022-06-29 19:51:10 +08:00
winlin
b4774d02cc Add log to file config. 2022-06-29 19:50:57 +08:00
winlin
e05535267b Disable reload for log config. 2022-06-29 19:29:50 +08:00
winlin
cb6a4d0143 Thread: Refine SrsThreadMutex and SrsThreadLocker. 2022-06-28 20:50:25 +08:00
winlin
339d3b31cc ST: Support thread-local for multiple threads. 
1. All statick and global variables is thread-local.
2. Call st_init() to init st for each thread.
3. Notice that ST is isolate for threads.
 2022-06-28 20:49:53 +08:00
winlin
d117145b95 Update date from 2021 to 2022. 2022-06-20 19:22:25 +08:00
winlin
f92fb9653b Speedup the test from srs-cache image. 2022-06-17 14:18:27 +08:00
winlin
c722eba48f SRT: Support Coroutine Native SRT over ST. (#3010). (1af30de). v5.0.30 2022-06-17 08:54:00 +08:00
winlin
82efa564e4 Merge branch '4.0release' into develop 2022-06-17 07:13:37 +08:00
winlin
d9352ec43b Disable all asm for FFmpeg, to compatible with ARM CPU. 2022-06-15 21:13:56 +08:00
winlin
f568e4f91d Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v5.0.29 2022-06-15 19:35:24 +08:00
winlin
d525d27e64 Merge from 4.0release 2022-06-15 19:21:13 +08:00
winlin
1f0ea3fdf5 Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252 2022-06-15 09:58:05 +08:00
winlin
93fed3874b SRT: Rebase develop. 2022-06-14 20:17:00 +08:00
winlin
0957cdb944 SRT: Refine the lock for log. 2022-06-14 20:05:11 +08:00
hondaxiao
910b5945af SRT: add srt log handle, srs log supoort multithread 2022-06-14 20:05:11 +08:00
hondaxiao
d03c6793b8 SRT: add srs_core_lock, support scope lock guard 2022-06-14 20:05:11 +08:00
hondaxiao
fd74b2f6e1 SRT: readd mix_correct, compatible old srt conf 2022-06-14 20:05:11 +08:00
hondaxiao
c037f920b2 SRT: move accept log into srt conn cycle 2022-06-14 20:05:11 +08:00
winlin
e09daa2d4b SRT: Change bridges to bridge. 2022-06-14 20:05:09 +08:00
winlin
077d93c7b6 SRT: Refine code, remove SrsSrtListenerType 2022-06-14 20:02:25 +08:00
winlin
9efb6de0b4 SRT: Merge develop, fix build fail. 2022-06-14 20:02:25 +08:00
winlin
d2149a8b79 SRT: Add todo for coroutine yield. 2022-06-14 20:02:25 +08:00
winlin
8437370c1e SRT: Refine packet error handler. 2022-06-14 20:02:25 +08:00
winlin
9a0db5a14f SRT: Undo extract of fetch_or_create_source and change mode_ to local. 2022-06-14 20:02:25 +08:00
winlin
6009395c10 SRT: Hide srt implements from API. 2022-06-14 20:02:25 +08:00
winlin
d39ec3cf45 SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT 2022-06-14 20:02:25 +08:00
winlin
94cc50d146 SRT: Wrap SRT stat object. 2022-06-14 20:02:25 +08:00
winlin
78b778fb93 SRT: Rename srs_service_st_srt to srs_protocol_srt 2022-06-14 20:02:25 +08:00
hondaxiao
fbc6eebe18 SRT: remove rtmp_to_srt 2022-06-14 20:02:25 +08:00
hondaxiao
43d98d0b1c SRT: remove mix_correct 2022-06-14 20:02:24 +08:00
hondaxiao
a5ac7cfe37 SRT: use srs code style in function defination 2022-06-14 20:02:24 +08:00
hondaxiao
59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 2022-06-14 20:02:24 +08:00
hondaxiao
dd8ccfe5d8 SRT: refine int to srs_utime_t in srt timeout config 2022-06-14 20:02:24 +08:00
hondaxiao
26498a00fe SRT: Tsbpdmode default on 2022-06-14 20:02:24 +08:00
hondaxiao
a929f79d2c SRT: Add SRT option annotation in full.conf 2022-06-14 20:02:24 +08:00
winlin
492e3a888c SRT: Refine the SRT socket code. 2022-06-14 20:02:24 +08:00
winlin
6c94e91792 SRT: Refine get_srt_poller to poller. 2022-06-14 20:02:24 +08:00
winlin
21899c5998 SRT: Initialize SRT eventloop in adapter. 2022-06-14 20:02:24 +08:00
winlin
4899be9c34 SRT: Refine the schedule resolution to 10ms if idle. 2022-06-14 20:02:24 +08:00
winlin
b507a080b2 SRT: Refine parse SRT listen ip and port. 2022-06-14 20:02:24 +08:00
winlin
3616c9976a SRT: Add srt vhost section to full.conf. 2022-06-14 20:02:24 +08:00
winlin
ef553b571c SRT: Update full.conf for review. 2022-06-14 20:02:24 +08:00
winlin
bda0268a37 SRT: Update full.conf for new configs. 2022-06-14 20:02:24 +08:00
winlin
d88fd12c26 SRT: Fix cmake bug, quit if error. 2022-06-14 20:02:24 +08:00
hondaxiao
b566182f0b SRT: fix utest failed 2022-06-14 20:02:24 +08:00
hondaxiao
e13d16439e SRT: support rtmp to srt 2022-06-14 20:02:22 +08:00
hondaxiao
7da792f19d SRT: check srt_connect return value 2022-06-14 19:59:13 +08:00
winlin
bb91297071 SRT: Eliminate unused files for SRT. 2022-06-14 19:59:12 +08:00
winlin
cf4fbb887b SRT: Support debugging with CLion. 2022-06-14 19:58:46 +08:00
hondaxiao
94fa0ff7bd Refine SRT code, with StateThread adpater 2022-06-14 19:58:42 +08:00
winlin
3ed4aed824 Fix build failed. 2022-06-09 20:46:20 +08:00
winlin
fa78cf3354 Prefix with srs_protocol in protocol directory. 2022-06-09 20:26:58 +08:00
winlin
665ad564fb Rename service to protocol files. 2022-06-09 19:59:51 +08:00
winlin
f1840b87e5 Fix typo, change bridger to bridge. 2022-06-09 19:35:07 +08:00
winlin
0304e78cf1 Support SIGABRT to generate coredump. 2022-05-25 12:45:58 +08:00
winlin
f469753b07 RTMP: Add conf for listen at IPv6. 2022-05-17 21:37:59 +08:00
winlin
310514ea94 Update players and console. 2022-05-16 22:44:21 +08:00
winlin
e2cc356c31 Update 3rdparty. 2022-05-16 22:37:22 +08:00
winlin
ec5bdc7dfa Refine the signaling dynamic images. 2022-05-16 22:24:27 +08:00
winlin
7e0beb11d8 Conf: Refine comments. 2022-05-10 22:17:55 +08:00
winlin
c574ab6465 Live: Refine edge cluster to support FLV. 2022-05-10 22:16:32 +08:00
winlin
e8240d64be HTTP: Add configure for nginx proxy. 2022-04-24 09:24:04 +08:00
winlin
2b2379de12 RTC: Refine player sdk, reject with xhr. 2022-04-10 16:39:56 +08:00
winlin
b3baa888ee RTC: Refine player sdk, directly use raw HTTP. 2022-04-08 23:02:32 +08:00
winlin
16babd2b64 Merge branch '4.0release' into develop 2022-04-07 13:48:59 +08:00
winlin
1d503c770f Fix proc stat issue. 2022-04-07 13:48:19 +08:00
winlin
f87a959480 Support NGINX HLS Cluster. 2022-04-04 16:49:15 +08:00
winlin
4163dce18d Support NGINX HLS Cluster. v5.0.28 2022-04-04 13:45:49 +08:00
winlin
101d1ffbbf Support DigitalOcean Droplet SRS 1-Click. v5.0.27 2022-03-30 12:39:56 +08:00
mapengfei53
8dc5853f8c
Fix parse_file function did not handle err (#2928) 
* Fix parse file function did not handle err

* Fix parse_file function did not handle err

* Fix error message

* Updated error information
 2022-03-19 13:22:27 +08:00
winlin
9385f2b80b Merge branch '4.0release' into develop 2022-03-19 13:21:58 +08:00
winlin
76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 2022-03-19 12:06:07 +08:00
winlin
41e35155f7 SRT: Compatible with previous auth querystring. #2908 2022-03-19 09:04:51 +08:00
loveforever
210cdf04be
SRT: url supports multiple QueryStrings (#2908) 
* SRT:  parse srt url to supports multiple QueryStrings.(#2893)

* SRT:  url supports multiple QueryStrings by  comma-separated key-value pairs with no nesting  (#2893)

* SRT:  url supports multiple QueryStrings by comma-separated key-value pairs with no nesting  (#2893)

* SRT: Add comments for url.

* Add utest for SRT URL parsing.

* Update README.

Co-authored-by: winlin <winlin@vip.126.com>
 2022-03-19 08:24:06 +08:00
winlin
c225c3f745 Merge branch '4.0release' into develop 2022-03-18 12:03:52 +08:00
winlin
06cff31b24 Update script. 2022-03-18 12:02:49 +08:00
winlin
fd219aa074 Refine utest script. 2022-03-18 12:01:11 +08:00
Winlin
350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 2022-03-17 16:56:52 +08:00
winlin
c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 2022-03-17 08:42:44 +08:00
winlin
61f1531aa3 Merge branch '4.0release' into develop 2022-03-15 08:48:26 +08:00
ChenGH
ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248 
Co-authored-by: Winlin <winlin@vip.126.com>
 2022-03-15 08:43:03 +08:00
ChenGH
70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966) 
Co-authored-by: Winlin <winlin@vip.126.com>
 2022-03-15 08:40:06 +08:00
winlin
636066124a SRT: Fix typo in libsrt build options. v5.0.26 2022-03-12 18:37:41 +08:00
everything411
d6ead6c0c5
SRT: Fix typo in libsrt build options (#2943) 
the cmake option is ENABLE_APPS, so we should use --disable-apps or --enable-apps=0. this commit fixes the typo.
 2022-03-12 18:34:30 +08:00
Haibo Chen
67ccd589c1
Security: Enable CIDR for allow/deny play/publish (#2914) 
* protocol/utility: add srs_ipv4_to_num

* protocol/utility: add srs_ipv4_within_mask

* protocol/utility: add srs_get_cidr_mask and CIDR_VALUES static struct

* protocol/utility: add srs_get_cidr_ipv4

* app/security: support cidr ip ranges in allow/deny rules

* conf: update security example with cidr ranges

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* fix compile error on centos6

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
 2022-03-11 12:24:35 +08:00
winlin
451b01011c Merge SRS 4.0 for bugfix. v5.0.25 2022-03-09 08:09:27 +08:00
winlin
9d3ae5c8ed Merge branch '4.0release' into develop 2022-03-09 08:06:56 +08:00
winlin
e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 2022-03-07 16:34:51 +08:00
winlin
107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 2022-03-07 15:53:55 +08:00
CommanderRoot
8a75e8a165
Replace deprecated String.prototype.substr() (#2948) 
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() or substring() which work similarily but aren't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2022-03-07 08:02:27 +08:00
mapengfei53
84951cbc74
Update the demo config file for include directive (#2927) 
* Update the demo config file for include directive

* update config file

* update config file
 2022-03-05 17:43:20 +08:00
Matthew
526cd62075
Fix FD leak when exceed max connections limit. (#2925) 
* fix fd leak

when tcp connection exceed max_connection, that connection will leak because of not closing the fd

* fix leak, code refine
 2022-02-26 07:50:09 +08:00
winlin
4b838659e9 Merge 4.0release, update AUTHORS 2022-02-18 12:45:22 +08:00
winlin
e222f0da1b Add active developers 2022-02-16 13:16:18 +08:00
winlin
88c8a4f6c0 Squash: Bug fixed 2022-02-16 11:34:05 +08:00
winlin
d78a4f25a6 Forward: Support dynamic forwarding by backend api. (#2799). v5.0.24 2022-02-16 11:14:25 +08:00
chundonglinlin
03cf93fc2b
Forward: support config full rtmp url forward to other server (#2799) 
* Forward: add backend config and demo server for dynamic create forwarder to other server.(#1342)

* Forward: if call forward backend failed, then return directly.

* Forward: add API description and change return value format.

* Forward: add backend conf file and wrapper function for backend service.

* Forward: add backend comment in full.conf and update forward.backend.conf.

* Forward: rename backend param and add comment tips.
 2022-02-16 10:49:16 +08:00
winlin
b94ae922d4 Fix warnings for uuid. v4.0.245 2022-02-15 19:07:37 +08:00
winlin
37b6b48882 SRT: Close connection if RTMP failed. (#2917). v4.0.244 2022-02-15 18:51:28 +08:00
loveforever
e8fca60ece
SRT: Close connection if RTMP failed. (#2917) 
* SRT: using global variables  to pass errors (#2897)

* SRT: using global variables  to pass errors (#2897)
 2022-02-15 18:49:17 +08:00
winlin
0a848430e9 Refine build script for SRT to avoid warnings. v4.0.243 2022-02-15 18:35:25 +08:00
winlin
eeb44ebbe9 Version: Ignore the mgmt version 2022-02-14 18:17:02 +08:00
winlin
957e952b41 Update authors 2022-02-14 15:30:02 +08:00
winlin
b839c2ea9c Support include directive for config file. (#2878). v5.0.23 2022-02-14 15:20:48 +08:00
mapengfei53
fde44885d9
Support include directive for config file (#2878) 
* Support include import configuration

* Remove support for regular rules

* Remove support for regular rules

* Fix configuration file parsing bug

* Added utest tests for include functionality

* Added utest tests for include functionality

* Modify the UTest function

* optimized code

* Config: Refine parse error with state

* Config: Reorder functions

* Config: Rename parsing type to context

* Config: Refine args for include

* Config: Add utests for include

* Config: Refine code, parsing recursively.

* Config: Change the mock from file to buffer

* Config: Mock buffer in config

* Config: Refine code

* Add utests for include

* Added utest for include

Co-authored-by: pengfei.ma <pengfei.ma@ngaa.com.cn>
Co-authored-by: winlin <winlin@vip.126.com>
 2022-02-14 15:08:51 +08:00
winlin
acf0af6b5a Squash: Update 2022-02-13 08:31:10 +08:00
winlin
8d88a5b4cc Release v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines. 2022-02-11 16:38:11 +08:00
winlin
c2b07ad943 Squash: Fix bugs 2022-02-11 08:44:31 +08:00
winlin
ff93bdd14f Mirror docker images in TCR Singapore. v4.0.240 2022-02-09 11:42:02 +08:00
winlin
e27b658ef9 Refine the error for WebRTC H5 publisher. v4.0.239 2022-02-08 11:54:04 +08:00
winlin
5c1556ac74 Squash: Refine release 2022-02-04 09:57:05 +08:00
winlin
d1534c099b Push docker to docker, acr and tcr. v4.0.238 2022-02-04 09:01:12 +08:00
winlin
32bb96a5c2 Squash: Fix bugs 2022-02-03 15:16:52 +08:00
winlin
dcf565bba1 Fix bug when the value of http header is empty. (#2888). v4.0.237 2022-02-03 15:07:37 +08:00
Haibo Chen
290c3b95a5 Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 2022-02-03 15:06:06 +08:00
Haibo Chen
b94ce1485a
Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 2022-02-03 15:05:09 +08:00
winlin
1d4fac0dbc Refine docker console, preview by players at the same server. v4.0.236 2022-01-30 22:36:01 +08:00
winlin
ba0b62fd37 For docker, always use the console for logging. v4.0.235 2022-01-30 22:01:21 +08:00
winlin
bdf6540c89 SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 2022-01-29 15:08:56 +08:00
Alex.CR
0c036e0435
SRT: Reduce the SRT bug by limit the max times for retry. 2022-01-29 15:07:01 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
winlin
339d942e7b Fix bug when free addrinfo. (#2886). v4.0.233 2022-01-23 08:09:37 +08:00
winlin
8f2d23ff73 Fix memory leak in SrsMetaCache. (#2887). v4.0.232 2022-01-23 08:09:20 +08:00
winlin
6c6c0f0f0f Support docker image for lighthouse. v4.0.231 2022-01-23 08:06:48 +08:00
stone
386ac44558
bugfix: SrsAutoFree addrinfo (#2886) 
* bugfix: SrsAutoFree addrinfo

* bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo)

Co-authored-by: wanglei <wanglei@unicloud.com>
 2022-01-23 07:18:16 +08:00
stone
92434cfeba
bugfix:SrsMetaCache memleak (#2887) 
Co-authored-by: wanglei <wanglei@unicloud.com>
 2022-01-22 18:50:10 +08:00
winlin
7c9f88be0b Eliminate unused *.as files for Adobe Flash. v5.0.22 2022-01-18 12:04:15 +08:00
winlin
12ffddd363 Release v5.0.21 2022-01-17 21:43:47 +08:00
winlin
dc43a11aed Enable rtmp2rtc and rtc2rtmp for docker.conf 2022-01-17 21:37:57 +08:00
winlin
5d8b950a06 Update CHANGELOG 2022-01-17 14:30:01 +08:00
winlin
b9bfe18829 CICD: Refine release for droplet 2022-01-17 14:13:42 +08:00
winlin
27e5d77302 Squash: Update README 2022-01-17 09:47:27 +08:00
winlin
16f17848bb Update README for **Cloud Virtual Machine** 2022-01-16 21:59:46 +08:00
winlin
55ea0a62d3 Build: Disable c++11 and c++14 for CentOS 6.0 2022-01-15 09:02:14 +08:00
winlin
d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 2022-01-13 18:40:22 +08:00
winlin
93aa0eb5ba Squash: Fix bugs 2022-01-13 18:26:28 +08:00
winlin
0dd6246c2f Release v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines. 2022-01-13 18:04:21 +08:00
winlin
7796083e9a RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229 2022-01-13 17:07:10 +08:00
chundonglinlin
584889754c
RTC: fix play rtc judge for config rtc2rtmp on.(#2863) (#2872) 2022-01-13 17:03:03 +08:00
winlin
99ff853de9 Refine package variables. v4.0.228 2022-01-13 17:01:57 +08:00
winlin
8830d267f2 Refine conf for vm.conf 2022-01-13 16:20:03 +08:00
winlin
6a5bc27f9b Support configure with --config as default config file. v4.0.227 2022-01-13 15:16:54 +08:00
winlin
3881c4c77e Add SrsAutoFreeH to release ptr with hooks. (#2880). v4.0.226 2022-01-13 14:05:00 +08:00
winlin
73d0ce1cee Support api to specify the WebRTC API port. v4.0.225 2022-01-13 13:34:06 +08:00
winlin
c6c2e97189 Support api_port to specify the WebRTC API port. v4.0.225 2022-01-13 12:16:45 +08:00
winlin
db3ceb445b Support api_port to specify the WebRTC API port. v4.0.224 2022-01-13 12:07:34 +08:00
winlin
e6ab5db113 LiveSource: Refine fetch for external exposed interface. (#2873). v4.0.223 2022-01-13 11:47:14 +08:00
chundonglinlin
7580341a1e
LiveSource/RtcSource: Refine fetch for external exposed interface. (#2873) 2022-01-13 11:43:32 +08:00
winlin
71a4b3c3f7 Add conf/lighthouse.conf for LightHouse. v4.0.222 2022-01-13 11:38:25 +08:00
winlin
d47dd81f46 Refine the running homepage. v4.0.221 2022-01-13 11:10:11 +08:00
winlin
fb93631407 Refine the running homepage. v4.0.221 2022-01-13 11:00:11 +08:00
winlin
574afb4320 Refine the running homepage. v4.0.221 2022-01-13 10:44:10 +08:00
winlin
7e25d0d7f4 Refine the running homepage. v4.0.221 2022-01-12 22:03:46 +08:00
chundonglinlin
c30aa479a7
RTC: Fix both rtmp and rtc streams can be published at the same time. (#2875) 2022-01-12 09:12:29 +08:00
winlin
4110fb14cb Squash: Fix bugs. v5.0.20 2022-01-11 08:40:37 +08:00
chundonglinlin
750c58beff
RTC: fix play rtc judge for rtmp inactive.(#2863) (#2867) 2022-01-11 08:18:06 +08:00
winlin
2bc5e9a8b4 RTC: fix play crash or no stream for rtmp2rtc tips.(#2863). v4.0.220 2022-01-10 19:16:01 +08:00
chundonglinlin
c85daeb12d
RTC: fix play crash or no stream for rtmp2rtc tips.(#2728) (#2863) 2022-01-10 19:14:11 +08:00
winlin
2f6d6a0ac0 Change warn to trace for release query 2022-01-07 16:41:02 +08:00
liuxiaoliang
4434bb1a25
SRT: use const string to sprint rtmp url. (#2847) 2022-01-06 12:02:31 +08:00
winlin
51ca3fd80a Only discover api server ip as candidate. 2022-01-06 11:31:06 +08:00
winlin
6919011e86 Update sync script, ignore gb28181 2022-01-05 14:36:42 +08:00
winlin
4d09b8caae When reopening segment, never update the duration. (#2717). v4.0.219 2022-01-05 08:29:20 +08:00
winlin
fbb6d9464c Discover api server and ip as candidates. v4.0.218 2022-01-04 22:31:27 +08:00
winlin
013fa8ac6c Install test-on self-sign certificate. v4.0.217 2022-01-04 16:47:38 +08:00
winlin
c0a7790c91 Update README 2022-01-04 12:05:28 +08:00
winlin
7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 2022-01-03 16:55:52 +08:00
winlin
8bc2759c7e Refine error log for rtmp2rtc. (#2728). v4.0.215 2021-12-31 11:42:49 +08:00
along
cf010064eb
Update srs_core.hpp (#2832) 
modify a word.
 2021-12-30 18:06:23 +08:00
winlin
56a9e4d140 Change images from gitee to ossrs.net 2021-12-30 11:28:10 +08:00
winlin
5aba212f3d Bugs fixed. (#2770)(#2820). v4.0.214 2021-12-29 11:57:15 +08:00
john
a9397598e8
Fix typo(HTTP-Server -> HTTPS-Server) (#2822) 2021-12-29 11:53:16 +08:00
chundonglinlin
a16590b3a6
SRT: Eliminate duplicate header file.(#2786) (#2827) 2021-12-29 11:52:02 +08:00
mapengfei53
3f8b1a2922
Fix the error of pps statistics (#2820) 2021-12-29 11:25:30 +08:00
akanchi
f1a448bc6a
SRT: Fix srt2rtmp crash when streamid is too long(#2770) (#2786) 2021-12-27 11:14:50 +08:00
winlin
c7ea21d06a Fix ulimit issue by detecting epoll on Ubuntu. (#2811). v4.0.213 2021-12-27 11:10:44 +08:00
Winlin
fd90e49cd6
CI: Support build and test for CentOS 6.0 (#2816) 2021-12-26 19:12:44 +08:00
winlin
d2fe83b032 RTC: Fix build warning 2021-12-26 18:16:10 +08:00
winlin
13103ec7d5 For #2815: Extract macros and headers for platform. 2021-12-26 17:50:19 +08:00
winlin
716e578a19 Squash: Fix bugs 2021-12-26 17:30:51 +08:00
winlin
d401c83a66 Refine install script 2021-12-26 17:11:45 +08:00
winlin
fb98113550 Fix #2815: Build fail for CentOS6 2021-12-26 17:11:26 +08:00
winlin
44e9dc83e9 Upgrade gperftools to 2.9 for GCP/GMC/GMP/GMD. (#2247) 2021-12-26 15:19:08 +08:00
winlin
63da0dca92 Cleanup server for GMC, by WaitGroup to destroy. (#2247). v4.0.206 2021-12-26 11:37:59 +08:00
winlin
ab97eb5fcf HTTP: Fix 2GB+ mp4/flv file downloading error. (#2809)(#2780)(#2781). v4.0.211 2021-12-25 08:29:34 +08:00
chundonglinlin
e73d00250b
HTTP: Fix mp4/flv file size exceed 2GB download error (#2780) (#2809) 2021-12-25 08:18:47 +08:00
winlin
faf5fb0a83 Refine the config 2021-12-24 10:37:58 +08:00
winlin
cc501e3eef Fix bug for large mp4(5G+) offset. (#2800). v4.0.210 2021-12-23 18:49:21 +08:00
john
aa85ce024b
DVR: Fix large file mp4 dvr failed. (#2800) 2021-12-23 18:41:05 +08:00
winlin
2f52d0aefa Fix bug for HLS log printing. (#2807). v4.0.209 2021-12-23 18:38:18 +08:00
winlin
d32195993d Refine the default config file. (#2711). v4.0.208 2021-12-23 18:34:40 +08:00
chundonglinlin
3188c772b1
RTC: Eliminate duplicate assignment for video packet frame type (#2803) 
Co-authored-by: zhangjunqin1 <zhangjunqin@jd.com>
 2021-12-21 08:32:17 +08:00
along
c15fadb9d5
Update the stable version to SRS 4.0 (#2802) 
now 4.0 is released and stable.
VERSION_STABLE should be 4
 2021-12-20 15:58:14 +08:00
winlin
ee24bb49f3 RTC: Support payload name AV1X/AV1. (#2784)(#2760). v4.0.207 2021-12-20 13:23:42 +08:00
Huachao Mao
faeacf1fc9
RTC: Replace payload name AV1X with AV1 for WebRTC. (#2760) (#2784) 
* RTC: Replace payload name AV1X with AV1 for WebRTC. (#2760)

* Add compatibility check code for old versions of Chrome

* 新增获取track_desc的AV1X编码兼容性检查
 2021-12-20 13:20:03 +08:00
winlin
5decc95e2e Release v4.0-b1, 4.0 beta1, v4.0.206, 144126 lines. 2021-12-19 16:49:43 +08:00
winlin
f05e67e1a6 Squash: Fix bugs 2021-12-13 09:24:16 +08:00
winlin
027715e4ea RTC: Update config 2021-12-12 15:53:08 +08:00
john
7c353b5986 RTC: Fix memory leak when replace rtp packet in cache. (#2771). v4.0.205 
* fix memory leak when replace rtp packet in cache.
 2021-12-07 09:11:01 +08:00
winlin
2f93e68285 RTC: Fix nack encode seqnum. (#2766). v4.0.204 2021-12-06 12:44:08 +08:00
long
4decc1fa6b
RTC: Fix nack encode seqnum (#2766) 
* fix nack encode seqnum

* add nack encode utest

* change Variable naming

Co-authored-by: liyalong1 <liyalong1@100tal.com>
 2021-12-06 12:42:39 +08:00
winlin
8576fa7052 Squash: Merge v4.0.203 2021-12-04 11:21:35 +08:00
winlin
5ccd63dec3 RTC: Fix bugs for RTC2RTMP. (#2768). v4.0.203 2021-12-04 11:16:20 +08:00
john
f3c4023c25
Fix bugs for RTC2RTMP. (#2768) 
1. Cache IDR frame's rtp timestamp instead of avsync timestamp.
2. Cache clock rate calculate by sender report.
3. Using srs_rtp_seq_distance instead of direct minus.
4. Add utest of av timestamp sync when duplicated sender report.
 2021-12-04 11:15:02 +08:00
winlin
b807ef9049 Fix dead links 2021-12-04 11:08:42 +08:00
winlin
4e64c66e02 RTC: Ignore empty audio packet when transcoding (#2757). v4.0.202 2021-12-04 10:56:37 +08:00
James
2c0cd9b58d
fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文 (#2757) 
* fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文

* fix #2690，出错信息中，显示相关参数名称

Co-authored-by: jiankai <wangjiankai@cmhi.chinamobile.com>
 2021-12-04 10:46:17 +08:00
winlin
e16830e989 Squash: Merge 4.0.201 2021-12-04 10:43:04 +08:00
winlin
bc063945f1 Build: Change make utest for test 2021-12-02 20:15:28 +08:00
winlin
4d10a453f6 Build: Change default make to build SRS only 2021-12-01 14:07:53 +08:00
winlin
04a8a2866b Release v4.0-b0, 4.0 beta0, v4.0.201, 144022 lines. 2021-12-01 10:39:26 +08:00
winlin
1ba3de1139 Refine CHANGELOG 2021-12-01 09:17:05 +08:00
winlin
542a3e4f36 RTC: Refine publish security error message (#2762). v4.0.200 2021-12-01 08:27:13 +08:00
johzzy
ff8657e1c5 RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751). v4.0.199 2021-11-25 07:36:12 +08:00
johzzy
a862573220
RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751) 2021-11-25 07:33:41 +08:00
winlin
1167f68165 FLV: Add realtime HTTP-FLV config 2021-11-20 09:54:42 +08:00
winlin
66435d583a Squash: Fix stat bug 2021-11-15 20:39:35 +08:00
winlin
f3380d2ec0 Fix bug for CPU arch info 2021-11-15 20:35:20 +08:00
winlin
93242918ad Squash: For #1708 2021-11-15 11:10:44 +08:00
winlin
5e22b1929a ST: Print log when multiple thread stop one coroutine. (#1708). v4.0.198 2021-11-15 10:34:38 +08:00
winlin
93964bb037 ST: Print log when multiple thread stop one coroutine. (#1708) 2021-11-15 09:35:23 +08:00
winlin
ff33940d90 WebRTC: Fail to publish RTC automatically for HTML5. 2021-11-14 21:59:37 +08:00
winlin
440f29b758 Squash: Merge #2732 2021-11-14 21:50:58 +08:00
winlin
7771fbe858 Fix #2732: WebRTC: Fail to publish RTC automatically for HTML5. 2021-11-14 13:48:48 +08:00
winlin
5f85d405e7 Squash: Merge #2721, #2729 2021-11-13 19:36:43 +08:00
winlin
be0f6197d0 RTC: check audio track exist when negotiate (#2729) v4.0.196 2021-11-13 19:32:56 +08:00
john
469bd8cfe2
RTC: check audio track exist when negotiate (#2729) 2021-11-13 19:09:45 +08:00
winlin
92f061ee7d Rtc2Rtmp: Use RTP timestamp to identify video frames. v4.0.195 (#2721) 2021-11-09 07:36:48 +08:00
john
878833bb95
Rtc2Rtmp: Using rtp timestamp to distinguish different video frame (#2721) 2021-11-09 07:35:00 +08:00
winlin
6cde9a0230 Squash: Guess config files by FHS 2021-11-07 18:53:21 +08:00
winlin
1f4dad024e Config: Guess config files by FHS. v4.0.194 (#2711) 2021-11-07 17:39:58 +08:00
Haibo Chen
b06661539c DVR: Copy req from publish. v4.0.193 (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 2021-11-07 17:01:45 +08:00
Haibo Chen
3974b319d1
DVR: Copy req from publish (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 2021-11-07 16:59:33 +08:00
winlin
84a16774b2 Fix build fail for CentOS6, without SO_REUSEPORT 2021-11-05 18:32:06 +08:00
winlin
df7faa1603 For #2369, #1708, #1941: Add utest to cover fail for close or stop 2021-11-04 08:47:40 +08:00
winlin
f4e87b17a3 AUTHORS: Update new contributors. 2021-11-04 07:38:19 +08:00
winlin
523b055c06 Squash: Support RPM. Fix bugs. 2021-11-04 07:37:17 +08:00
Haibo Chen
27083430ce Edge: Refuse edge request when state is stopping (#2707) 2021-11-04 07:30:30 +08:00
Haibo Chen
a01354a595
Edge: Refuse edge request when state is stopping (#2707) 2021-11-04 07:28:48 +08:00
Purple Grape
948a3c84eb
RPM: Use user no-body to start SRS (#2706) 
1、修正启动身份问题
2、其它改进
 2021-11-04 07:26:37 +08:00
john
2d6ec03c5b
RTC: Remove no need code when check sdp. (#2702) 2021-11-03 07:45:37 +08:00
winlin
3df92bf30f RPM: Add RTC for rpm for CentOS/RHEL (#2701) 2021-11-03 07:40:56 +08:00
Purple Grape
75909c82d0
Package rpm support for CentOS/RHEL (#2701) 
* rpm support

提供全套rpm打包方案，降低软件使用的入门难度：
1、FHS路径标准化
2、全新的init/systemd启动脚本，同时支持el6和el7
3、普通用户身份运行
4、开箱即用的默认配置文件
5、自动日志轮转

* Create srs.spec
 2021-11-03 07:36:54 +08:00
winlin
eb20458d23 Auto create package by github actions. v4.0.191 2021-11-02 07:34:45 +08:00
winlin
ab5079909d For #2369, #1708, #1941: Check errno when close fd or stop thread 2021-10-31 19:33:27 +08:00
qingfuliao
60ab81a5c7 IDE: Fix build problem caused by ffmpeg/pthread dependency. (#2579) 2021-10-30 12:13:37 +08:00
马文武
54b706d36e Script: Refine CentOS7 service script to restart SRS. v4.0.190 (#2552) 2021-10-30 12:09:22 +08:00
Abrar Ahmed
b9288668a7 SRT: Type from shoulde to should. (#2455) 
Change word typo from shoulde to should
 2021-10-30 11:42:24 +08:00
HungMingWu
cc99226ed5 SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189 2021-10-30 08:40:25 +08:00
winlin
8125dd4dd1 Forward: Fast quit when cycle fail. v4.0.188 (#2284) 2021-10-30 07:59:57 +08:00
winlin
da7fac0939 Release SRS v5.0.19, develop version, not stable 2021-10-28 08:06:26 +08:00
winlin
ed1c499bd3 Gop: Ignore zero timestamp when shrinking. v4.0.187 (#2186) 2021-10-28 07:52:24 +08:00
winlin
e8380cda29 Demos: Remove the unused H5 demo files. (#2469) 2021-10-27 18:40:43 +08:00
winlin
e1f65478af Sqush: Refine config for origin cluster 2021-10-27 17:34:03 +08:00
lvndry
e176401499 Cluster: Origin server shouldn't be it's own coworker. v4.0.186 (#1963) 2021-10-27 07:46:24 +08:00
winlin
3c4b9be76b For #2689, Refine the patches for loongarch 2021-10-26 07:15:11 +08:00
Haibo Chen
ced518ea92 STAT: Add server_id into http_hooks (#2692) v4.0.185 2021-10-25 14:14:06 +08:00
Haibo Chen
88cdba6965
STAT: Add server_id into http_hooks (#2692) 2021-10-25 14:11:15 +08:00
winlin
a6c4cc9692 Squash: Merge SRS 4.0, API: Always stat client event if auth fail. 2021-10-24 20:58:34 +08:00
winlin
5783c4420f For #2689: Support stat for CPU archs. 2021-10-24 18:45:47 +08:00
winlin
99904f9ec2 For #2689: Support stat for CPU archs. 2021-10-24 18:41:12 +08:00
winlin
5b44cc6a17 For #2689, Support loongarch, loongson CPU. v5.0.19 2021-10-24 18:00:54 +08:00
Haibo Chen
592d4964ef API: Always stat client event if auth fail. v4.0.183 2021-10-22 08:06:39 +08:00
Haibo Chen
a86f3905b2
Put the statistics code after http callback (#2687) 2021-10-22 08:03:49 +08:00
winlin
f0910cf9b7 Squash: For #1758: Fix bug for marshal JSON with SDP. 2021-10-21 09:03:17 +08:00
winlin
31693d4b61 For #1758: Fix bug for marshal JSON with SDP. 2021-10-21 07:36:01 +08:00
winlin
665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 2021-10-20 09:16:18 +08:00
xmedia-systems
34b968aabf JSON: Support escape special chars. (#1758) v4.0.182 2021-10-20 08:57:40 +08:00
Matheus Macabu
061d544195 RTMP: If port is explicity set to 0, use default 1935 (#1754). v4.0.181 2021-10-19 08:24:37 +08:00
Matheus Macabu
9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 2021-10-19 08:20:28 +08:00
winlin
85131dad63 Squash: Update SRS 4.0 version 2021-10-18 15:10:05 +08:00
Alex.CR
bb7cd6af3a SRT: Solve mpegts demux assert bug (#2670) v4.0.180 
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-10-18 15:07:33 +08:00
Alex.CR
60c8724879
SRT: Solve mpegts demux assert bug (#2670) 
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-10-18 15:03:47 +08:00
winlin
596dd8c523 Support daemon(fork twice) for Darwin/OSX. v5.0.18 2021-10-17 16:53:39 +08:00
Haibo Chen
7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 2021-10-16 14:06:43 +08:00
winlin
e03ada39a1 Squash: SRS v4.0.179 2021-10-16 08:07:57 +08:00
Haibo Chen
3fc287f7de API: Fix the same 'client_id' error when asynchronous call (#2665) v4.0.179 2021-10-16 07:53:18 +08:00
Haibo Chen
974bed6b26
API: Fix the same 'client_id' error when asynchronous call (#2665) 2021-10-16 07:50:47 +08:00
winlin
9517ef123d Squash: Update SRS 4.0 version 2021-10-14 18:33:31 +08:00
Alex.CR
1649386ed5 SRT: Pes error when mpegts demux in srt. v4.0.178 
* solve mpegts demux bug

* solve pes error when mpegts demux
 2021-10-13 19:53:20 +08:00
Alex.CR
44f1d8ed6d
SRT: Pes error when mpegts demux in srt (#2671) 
* solve mpegts demux bug

* solve pes error when mpegts demux
 2021-10-13 19:51:05 +08:00
winlin
cd7e5a131e Squash: SRS 4.0, Stat the oc(origin cluster). 2021-10-13 09:03:47 +08:00
winlin
18a155bf31 API: Stat the oc(origin cluster). 2021-10-13 08:13:00 +08:00
winlin
533e86eaf8 API: Stat the oc(origin cluster). 2021-10-12 21:40:46 +08:00
winlin
135bef2182 Test: Update srs-bench depends 2021-10-12 20:30:40 +08:00
winlin
e127880ec2 Squash: Merge SRS 4.0 2021-10-12 15:09:52 +08:00
Haibo Chen
a2003b3a85 API: Use publish param instead of play (#2550) v4.0.177 2021-10-12 14:07:16 +08:00
Haibo Chen
579b90dc1e
on_dvr: use publish param instead of play (#2550) 2021-10-12 14:04:22 +08:00
winlin
4e6a3321cd Squash: Merge SRS 4.0 2021-10-12 14:04:02 +08:00
winlin
5d5df7923b Config: If docker.conf does not exists, try srs.conf 2021-10-12 14:02:35 +08:00
Haibo Chen
eb3bbf1bca For #2549: Fix duration issue for HLS on_hls. v4.0.176 2021-10-12 09:18:39 +08:00
Haibo Chen
93cd025e2a
replace the placeholder of ts url in m3u8 (#2549) 2021-10-12 09:15:21 +08:00
winlin
b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 2021-10-12 08:36:24 +08:00
winlin
d6064ac608 UTest: Fix utest fail for config 2021-10-11 23:28:37 +08:00
winlin
29cf13afa0 Fix #1641, HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 2021-10-11 23:16:05 +08:00
winlin
71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 2021-10-11 22:14:45 +08:00
winlin
fe9e43b6d4 RTC: Refine config for RTC 2021-10-11 16:36:05 +08:00
winlin
0b99f06eff Test: Add RTMP to RTC regression test. 2021-10-11 09:34:08 +08:00
winlin
f8b4121497 Test: Add Multiple Sequence test for RTMP 2021-10-11 08:04:12 +08:00
winlin
29b98c49cc Test: Refine RTMP regression test. 2021-10-10 18:41:14 +08:00
winlin
9c315c94fc For #1641, Support RTMP publish and play regression test. v4.0.173 2021-10-10 18:09:52 +08:00
winlin
0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 2021-10-10 17:17:14 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
2fa5a0bee8 Fix #2304, Remove Push RTSP feature. v4.0.171 2021-10-10 11:50:07 +08:00
winlin
9edf63bd30 3rdparty: Sync httpx-static 2021-10-10 11:37:19 +08:00
winlin
df53c801b2 For #2653: Update config for HTTP RAW API removed. 2021-10-10 10:28:19 +08:00
winlin
cf99ebf186 Fix #2653: Remove HTTP RAW API. v4.0.170 2021-10-10 10:23:27 +08:00