7404 Commits (8e66e2ac96c04ca1d561858ec7a6189226f2c423)

 

All Branches   

Search

Author	SHA1	Message	Date
winlin	8e66e2ac96	Merge branch '4.0release' into merge/develop	4 years ago
winlin	526c6772c5	Merge branch 'develop' into merge/develop	4 years ago
winlin	afa32910c9	Fix bugs and enhance code. 4.0.142	4 years ago
winlin	66a696efe0	[IDE] Refine .gitignore for cmake from ide/srs_clion	4 years ago
winlin	2e222d369d	[IDE] Refine CMakeLists.txt, use absolute path	4 years ago
winlin	c209e547a8	[IDE] Support CLion and cmake to build and debug SRS. 4.0.141 ... 1. Remove all except JetBrains clion by cmake 2. Add .run/srs.run.xml for debugging for CLion. 3. Auto configure SRS when load CMakeLists.txt	4 years ago
winlin	12ba584ea3	Fix build failed	4 years ago
winlin	dca0397c47	Update README	4 years ago
winlin	3182dee1c5	Update README.md	4 years ago
winlin	8f91a90f28	Squash: Fix padding packets for RTMP2RTC	4 years ago
winlin	a47c55a171	Merge branch '4.0release' into merge/develop	4 years ago
winlin	1e27fec8de	Merge branch 'develop' into merge/develop	4 years ago
winlin	73e8133e84	Merge branch 'develop' into merge/develop	4 years ago
Winlin	c8a1e0f3da	Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464) ... * Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 * Update README.md * Update README.md * Refine format for AUTHORS.md	4 years ago
Haibo Chen	90b7933dbb	For #2403, fix padding packets for RTMP2RTC. 4.0.140. ... Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461) * Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy * make clear for magic number make clear for magic number * Update srs_app_rtc_source.cpp	4 years ago
winlin	10b9a81061	RTC: Support eip/candidate to set the eip of server	4 years ago
Haibo Chen	7eee9aa598	Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461) ... * Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy * make clear for magic number make clear for magic number * Update srs_app_rtc_source.cpp	4 years ago
winlin	b121f5f588	Update SRS 4.0 docker	4 years ago
Winlin	77c958ad1c	RTC: Trim SDP line space for pion/webrtc client. (#2466)	4 years ago
winlin	56310ffd9d	Refine .curcleci workflow	4 years ago
winlin	481f8b203c	Refine .curcleci workflow	4 years ago
winlin	14bc799029	Refine .curcleci workflow	4 years ago
winlin	5beea97e8e	Refine .curcleci workflow	4 years ago
winlin	5a7a742f36	Squash: Update README	4 years ago
winlin	2538a74e36	Merge branch '4.0release' into merge/develop	4 years ago
winlin	ce1b09da28	Merge branch 'develop' into merge/develop	4 years ago
winlin	67ebd08342	Add role(srs) to query versions	4 years ago
winlin	a88eb5242e	Update README.md	4 years ago
winlin	13d015b8fd	Squash: Fix random bug	4 years ago
winlin	dace2452d5	Merge	4 years ago
winlin	fd375096d8	Merge branch 'develop' into merge/develop	4 years ago
winlin	642359a50e	For #2424, use srandom/random to generate. 4.0.139	4 years ago
winlin	db3e11152e	Move AUTHORS.txt to trunk for docker. 5.0.7	4 years ago
winlin	e1a3dfb076	Merge branch '4.0release' into merge/develop	4 years ago
winlin	67adefd391	Merge branch 'develop' into merge/develop	4 years ago
winlin	e802fe5bd6	Release 4.0.138	4 years ago
Haibo Chen	03c5f76e64	update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452)	4 years ago
Haibo Chen	d32d8c0da6	update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452)	4 years ago
winlin	9f5d011687	Squash: Fix build fail for arm/aarch64	4 years ago
winlin	46c9e88d8a	Merge branch '4.0release' into merge/develop	4 years ago
winlin	e916611116	Merge branch 'develop' into merge/develop	4 years ago
winlin	b8dcf20237	Fix build fail for arm/aarch64	4 years ago
winlin	81a5c1b8da	Move AUTHORS.txt to trunk for docker to access it	4 years ago
winlin	75530efbc4	Squash: Merge #2448, #2440	4 years ago
winlin	2bd0deac47	Merge branch '4.0release' into merge/develop	4 years ago
winlin	7ad022c540	Merge branch 'develop' into merge/develop	4 years ago
winlin	ef43532cf4	Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137	4 years ago
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>	4 years ago
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>	4 years ago
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>	4 years ago