1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

4023 commits

Author SHA1 Message Date
winlin
19caa11244 Merge branch 'develop' into min 2020-03-12 12:18:54 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00
winlin
4b395f6e16 Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128 2020-03-12 11:55:37 +08:00
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
winlin
c1e07d6a96 For #1634, always check status in thread loop. 3.0.126 2020-03-12 08:59:13 +08:00
winlin
7ecd01e657 Merge branch 'develop' into min 2020-03-11 19:46:03 +08:00
winlin
6a765ab849 Merge SRS3 2020-03-11 19:45:01 +08:00
winlin
6c55fd3e4b For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 2020-03-11 19:42:42 +08:00
winlin
c61c2a939f For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 2020-03-11 19:33:55 +08:00
winlin
c78595c1fa For #1634, refactor encoder output, support timestamp variables. 2020-03-11 19:19:17 +08:00
winlin
66b194cd63 For #1634, refactor encoder process management. 2020-03-11 19:08:36 +08:00
winlin
927c0c8e39 For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124 2020-03-11 19:04:52 +08:00
winlin
fe09f3af87 Merge branch 'develop' into min 2020-03-07 22:46:47 +08:00
winlin
5586c2a128 For #1612, refactor return value for RTSP initialize. 2020-03-07 22:42:23 +08:00
winlin
dcb0553cc8 For #1612, fix crash bug for RTSP. 4.0.12 2020-03-07 22:35:11 +08:00
winlin
12a74326e8
Merge pull request #1612 from xialixin/develop
Fix disconnect RTSP connection has assertion, resulting in program exit
2020-03-07 22:31:34 +08:00
winlin
5f9ded73ce
Merge pull request #1625 from wasphin/feature/remove-unused-ip
Remove unused ip variable
2020-03-07 22:28:56 +08:00
winlin
41acf9ca8e For #1631, support sei_filter for SRT. 4.0.11 2020-03-07 22:25:19 +08:00
runner365
a2839aacdf add h264 sei filter 2020-03-07 16:15:36 +08:00
runner365
4242985b36 update only support h264+aac 2020-03-07 15:15:14 +08:00
Xiaofeng Wang
b525fc65aa Remove unused ip variable
* "inet addr" is not compatible with rhel/centos 7+;
* ifconfig has been replaced by ip-utils in newer distro;
2020-03-03 21:10:43 +08:00
runner365
40a09958c4 add checking for pes_parse 2020-03-01 19:42:32 +08:00
winlin
1b9a705e4b For #1621, support mix_correct for aggregate aac packets. 4.0.10 2020-03-01 10:17:03 +08:00
winlin
f917cc1e0c
For SRT, perfer mix_correct to true as default. 2020-03-01 10:09:44 +08:00
runner365
7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs 2020-02-29 16:47:20 +08:00
runner365
ed1a3aa37c Merge branch 'develop' into 3.0release.srt.dev 2020-02-26 17:46:44 +08:00
winlin
ea305790df For #1579, refactor log for gracefully quit. 2020-02-26 16:38:06 +08:00
runner365
4bd37d43b4 solve dts==0 bugs; solve large aac 2930bytes timestamp bugs 2020-02-26 11:14:05 +08:00
winlin
bbdbcf173c For #1615, refactor the version and API for SRT. 2020-02-26 09:06:53 +08:00
winlin
7f0b3afc99 Merge branch 'develop' into min 2020-02-25 18:23:14 +08:00
winlin
04d0620dde For #1615, fix build failed and srt api issue 2020-02-25 13:45:05 +08:00
winlin
90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 2020-02-25 13:22:44 +08:00
winlin
771f07ee07 Merge branch 'develop' into 4.0release 2020-02-25 09:55:19 +08:00
winlin
1e998678f7
Merge pull request #1615 from runner365/3.0release.srt.dev
update streamid decode for get more encoder such as VMIX
2020-02-25 09:54:33 +08:00
runner365
0dd72e0e5b Merge branch '3.0release.srt.dev' into 3.0release 2020-02-24 12:56:01 +08:00
runner365
bbfa552140 update streamid decode for get more encoder such as VMIX 2020-02-24 12:55:17 +08:00
winlin
67d78dff0e For #1598, support SLB health checking by TCP. 4.0.8 2020-02-21 23:56:40 +08:00
winlin
ef2b123325 Merge branch '3.0release' into 4.0release 2020-02-21 23:52:04 +08:00
winlin
20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 2020-02-21 23:51:40 +08:00
winlin
4a69499f2c Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122 2020-02-21 23:11:09 +08:00
winlin
1d01ef499d For #1579, support rolling update of k8s. 4.0.7 2020-02-20 01:06:33 +08:00
winlin
eb01674ecf Merge branch 'develop' into min 2020-02-19 00:22:39 +08:00
winlin
ad3cfbfd2c For #1579, support start/final wait for gracefully quit. 4.0.6 2020-02-18 23:39:40 +08:00
winlin
388ad61cdc Merge branch '3.0release' into 4.0release 2020-02-18 23:38:52 +08:00
winlin
dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 2020-02-18 23:37:11 +08:00
winlin
d87f58a611 For #1579, support gracefully quit and force to. 4.0.5 2020-02-18 22:16:28 +08:00
winlin
0c48c42f36 Merge branch '3.0release' into 4.0release 2020-02-18 22:15:29 +08:00
winlin
58b40478b6 For #1579, support force gracefully quit. 3.0.120 2020-02-18 22:15:12 +08:00
winlin
eefd74e0e4 Merge branch '3.0release' into develop 2020-02-18 20:25:07 +08:00
winlin
3c597545b1 For #1579, support gracefully quit. 3.0.119 2020-02-18 19:59:47 +08:00