Commit Graph

7710 Commits (ce9edb9166a76ad6ba5769f10368c51cc8226182)
 

Author SHA1 Message Date
winlin ce9edb9166 Merge branch 'develop' into merge/develop 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
winlin 46e1eada2d Merge branch '4.0release' into merge/develop 3 years ago
winlin fb7ad33dd8 Merge branch 'develop' into merge/develop 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
winlin 37cd894042 Merge branch '4.0release' into merge/develop 3 years ago
winlin ff50ffd3ea Merge branch 'develop' into merge/develop 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 f7c32b45fd Actions: Refine release message 3 years ago
winlin 9517ef123d Squash: Update SRS 4.0 version 3 years ago
winlin 5003067aa9 Merge branch '4.0release' into merge/develop 3 years ago
winlin 761820e0ec Merge branch 'develop' into merge/develop 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 65d947f3fb Merge branch '4.0release' into merge/develop 3 years ago
winlin eacaf61ac7 Merge branch 'develop' into merge/develop 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
winlin 6e22f7df3c Merge branch '4.0release' into merge/develop 3 years ago
winlin 772e6fd98a Merge branch 'develop' into merge/develop 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 e09acf2c67 Update 3 years ago
winlin b1b823a9b7 Merge branch 'develop' into merge/develop 3 years ago
winlin 5d5df7923b Config: If docker.conf does not exists, try srs.conf 3 years ago
winlin 219198d0ee Release 4.0 dev6, v4.0.176, 143675 lines. 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 d30145d500 Merge branch '4.0release' into merge/develop 3 years ago
winlin d0c32d413e Merge branch 'develop' into merge/develop 3 years ago
winlin d6064ac608 UTest: Fix utest fail for config 3 years ago
winlin 29cf13afa0 Fix #1641, HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 3 years ago
winlin 71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 3 years ago
winlin fe9e43b6d4 RTC: Refine config for RTC 3 years ago
winlin 0b99f06eff Test: Add RTMP to RTC regression test. 3 years ago
winlin f8b4121497 Test: Add Multiple Sequence test for RTMP 3 years ago
winlin 29b98c49cc Test: Refine RTMP regression test. 3 years ago
winlin 9c315c94fc For #1641, Support RTMP publish and play regression test. v4.0.173 3 years ago
winlin 0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 3 years ago