Commit Graph

6057 Commits (fd7589a2864a352552c2dde39e4c442210f09839)

Author SHA1 Message Date
winlin fd7589a286 Merge 3 years ago
qingfuliao 60ab81a5c7 IDE: Fix build problem caused by ffmpeg/pthread dependency. (#2579) 3 years ago
马文武 54b706d36e Script: Refine CentOS7 service script to restart SRS. v4.0.190 (#2552) 3 years ago
Abrar Ahmed b9288668a7 SRT: Type from shoulde to should. (#2455)
Change word typo from shoulde to should
3 years ago
HungMingWu cc99226ed5 SRTP: Patch libsrtp2 to fix GCC10 build fail. v4.0.189 3 years ago
winlin 8125dd4dd1 Forward: Fast quit when cycle fail. v4.0.188 (#2284) 3 years ago
winlin 7c96146d21 Merge branch '4.0release' into merge/develop 3 years ago
winlin ed1c499bd3 Gop: Ignore zero timestamp when shrinking. v4.0.187 (#2186) 3 years ago
winlin e8380cda29 Demos: Remove the unused H5 demo files. (#2469) 3 years ago
winlin 4bf8ab0f10 Merge branch '4.0release' into merge/develop 3 years ago
lvndry e176401499 Cluster: Origin server shouldn't be it's own coworker. v4.0.186 (#1963) 3 years ago
winlin 3c4b9be76b For #2689, Refine the patches for loongarch 3 years ago
Haibo Chen ced518ea92 STAT: Add server_id into http_hooks (#2692) v4.0.185 3 years ago
Haibo Chen 88cdba6965
STAT: Add server_id into http_hooks (#2692) 3 years ago
winlin a6c4cc9692 Squash: Merge SRS 4.0, API: Always stat client event if auth fail. 3 years ago
winlin 5783c4420f For #2689: Support stat for CPU archs. 3 years ago
winlin 99904f9ec2 For #2689: Support stat for CPU archs. 3 years ago
winlin 5b44cc6a17 For #2689, Support loongarch, loongson CPU. v5.0.19 3 years ago
Haibo Chen 592d4964ef API: Always stat client event if auth fail. v4.0.183 3 years ago
Haibo Chen a86f3905b2
Put the statistics code after http callback (#2687) 3 years ago
winlin f0910cf9b7 Squash: For #1758: Fix bug for marshal JSON with SDP. 3 years ago
winlin 31693d4b61 For #1758: Fix bug for marshal JSON with SDP. 3 years ago
winlin 665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 3 years ago
xmedia-systems 34b968aabf JSON: Support escape special chars. (#1758) v4.0.182 3 years ago
Matheus Macabu 061d544195 RTMP: If port is explicity set to 0, use default 1935 (#1754). v4.0.181 3 years ago
Matheus Macabu 9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 3 years ago
winlin 85131dad63 Squash: Update SRS 4.0 version 3 years ago
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>
3 years ago
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>
3 years ago
winlin 596dd8c523 Support daemon(fork twice) for Darwin/OSX. v5.0.18 3 years ago
Haibo Chen 7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 3 years ago
winlin e03ada39a1 Squash: SRS v4.0.179 3 years ago
Haibo Chen 3fc287f7de API: Fix the same 'client_id' error when asynchronous call (#2665) v4.0.179 3 years ago
Haibo Chen 974bed6b26
API: Fix the same 'client_id' error when asynchronous call (#2665) 3 years ago
winlin 9517ef123d Squash: Update SRS 4.0 version 3 years ago
Alex.CR 1649386ed5 SRT: Pes error when mpegts demux in srt. v4.0.178
* solve mpegts demux bug

* solve pes error when mpegts demux
3 years ago
Alex.CR 44f1d8ed6d
SRT: Pes error when mpegts demux in srt (#2671)
* solve mpegts demux bug

* solve pes error when mpegts demux
3 years ago
winlin cd7e5a131e Squash: SRS 4.0, Stat the oc(origin cluster). 3 years ago
winlin 18a155bf31 API: Stat the oc(origin cluster). 3 years ago
winlin 533e86eaf8 API: Stat the oc(origin cluster). 3 years ago
winlin 135bef2182 Test: Update srs-bench depends 3 years ago
winlin e127880ec2 Squash: Merge SRS 4.0 3 years ago
Haibo Chen a2003b3a85 API: Use publish param instead of play (#2550) v4.0.177 3 years ago
Haibo Chen 579b90dc1e
on_dvr: use publish param instead of play (#2550) 3 years ago
winlin 4e6a3321cd Squash: Merge SRS 4.0 3 years ago
winlin 5d5df7923b Config: If docker.conf does not exists, try srs.conf 3 years ago
Haibo Chen eb3bbf1bca For #2549: Fix duration issue for HLS on_hls. v4.0.176 3 years ago
Haibo Chen 93cd025e2a
replace the placeholder of ts url in m3u8 (#2549) 3 years ago
winlin b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 3 years ago
winlin d6064ac608 UTest: Fix utest fail for config 3 years ago