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
8625 commits 14 branches 107 tags 377 MiB
Commit graph

8625 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
dace2452d5 Merge 2021-07-04 16:03:27 +08:00
winlin
fd375096d8 Merge branch 'develop' into merge/develop 2021-07-04 16:02:47 +08:00
winlin
642359a50e For #2424, use srandom/random to generate. 4.0.139 2021-07-04 15:50:29 +08:00
winlin
db3e11152e Move AUTHORS.txt to trunk for docker. 5.0.7 2021-07-01 06:30:24 +08:00
winlin
e1a3dfb076 Merge branch '4.0release' into merge/develop 2021-07-01 06:27:12 +08:00
winlin
67adefd391 Merge branch 'develop' into merge/develop 2021-07-01 06:27:08 +08:00
winlin
e802fe5bd6 Release 4.0.138 2021-07-01 06:25:36 +08:00
Haibo Chen
03c5f76e64 update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:23:29 +08:00
Haibo Chen
d32d8c0da6
update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:22:16 +08:00
winlin
9f5d011687 Squash: Fix build fail for arm/aarch64 2021-06-30 10:28:23 +08:00
winlin
46c9e88d8a Merge branch '4.0release' into merge/develop 2021-06-30 10:27:02 +08:00
winlin
e916611116 Merge branch 'develop' into merge/develop 2021-06-30 10:26:57 +08:00
winlin
b8dcf20237 Fix build fail for arm/aarch64 2021-06-30 10:02:05 +08:00
winlin
81a5c1b8da Move AUTHORS.txt to trunk for docker to access it 2021-06-30 08:20:53 +08:00
winlin
75530efbc4 Squash: Merge #2448, #2440 2021-06-30 07:32:28 +08:00
winlin
2bd0deac47 Merge branch '4.0release' into merge/develop 2021-06-30 07:29:22 +08:00
winlin
7ad022c540 Merge branch 'develop' into merge/develop 2021-06-30 07:29:18 +08:00
winlin
ef43532cf4 Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137 2021-06-30 07:26:45 +08:00
Alex.CR
7e164b0061 SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:26:40 +08:00
long
cff4c07be4
打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448) 
* Update srs_app_rtmp_conn.cpp

修复推重复的RTMP流导致的RTC和RTMP播放的问题

* change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

Co-authored-by: Haibo Chen <495810242@qq.com>
 2021-06-30 07:24:12 +08:00
Alex.CR
346cc96d7a
SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:14:56 +08:00
winlin
cbca6d94d1 Add API path document 2021-06-28 14:45:33 +08:00
winlin
98e56f5325 Refine the random id by srs_random_str 2021-06-28 08:34:00 +08:00
winlin
0391e71682 Squash: Merge SRS4 2021-06-28 08:02:49 +08:00
winlin
d166354498 Merge branch '4.0release' into merge/develop 2021-06-28 08:01:47 +08:00
winlin
a64827c0dd Merge branch 'develop' into merge/develop 2021-06-28 08:01:42 +08:00
winlin
6ea270adf3 Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136 2021-06-28 07:54:50 +08:00
Xiaoniu
31679c46d4 check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:53:16 +08:00
Xiaoniu
f986b5956b
check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:51:57 +08:00
winlin
d02ba80db1 Squash: Fix bug for building FFmpeg 2021-06-28 07:51:02 +08:00
winlin
13ccf50773 Merge branch '4.0release' into merge/develop 2021-06-28 07:50:16 +08:00
winlin
ae27bef823 Merge branch 'develop' into merge/develop 2021-06-28 07:50:13 +08:00
winlin
bfae75077e Fix #2431, configure FFmpeg bug. 4.0.135 2021-06-28 07:46:13 +08:00
winlin
c8d8581d4b For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134 2021-06-28 07:39:24 +08:00
Hung-Yi Chen
bbd9d864d5
Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444) 2021-06-28 07:35:52 +08:00
winlin
5ee20613ca Squash: Support query lastest available version. 5.0.6 2021-06-28 07:33:24 +08:00
winlin
6dc9ac311a Merge 2021-06-28 07:31:58 +08:00
winlin
6fa9f33f27 Merge branch 'develop' into merge/develop 2021-06-28 07:30:24 +08:00
Xiaoniu
7bf03ef2ba Fix #2068, losing of last HLS ts file 4.0.133 
fix bug: last segment of ts not trigger 'on_hls',
because of 'on_unpublish' earlier than 'segment_close' (#2438)
 2021-06-28 07:28:46 +08:00
Xiaoniu
d987e194ff
fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438) 2021-06-28 07:25:25 +08:00
winlin
aa12251084 Fix bug for v3.0-r6 2021-06-27 10:11:15 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
332732c48c Merge #2429 to fix SRT bug. 4.0.131 2021-06-24 22:14:13 +08:00
winlin
ce47d5cc28 Squash: Update README 2021-06-24 22:11:19 +08:00
winlin
32bb99988e Merge 2021-06-24 22:10:31 +08:00
winlin
f2fd184578 Merge branch '4.0release' into merge/develop 2021-06-24 22:09:59 +08:00
winlin
6ec1a383fa Merge #2419 to fix SRT bug. 4.0.131 2021-06-24 22:09:09 +08:00
winlin
25262dd3cb Fix SRT bug. 4.0.131 2021-06-24 22:07:48 +08:00
Alex.CR
bb9aefd869 srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-24 22:03:59 +08:00
Alex.CR
67ac720b92
srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-24 22:03:18 +08:00