external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
7406 commits 13 branches 107 tags 375 MiB
Commit graph

7406 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
cc9c74850c Merge branch 'develop' into merge/develop 2021-07-17 19:48:29 +08:00
winlin
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +08:00
winlin
8e66e2ac96 Merge branch '4.0release' into merge/develop 2021-07-17 19:38:41 +08:00
winlin
526c6772c5 Merge branch 'develop' into merge/develop 2021-07-17 19:38:38 +08:00
winlin
afa32910c9 Fix bugs and enhance code. 4.0.142 2021-07-17 19:16:26 +08:00
winlin
66a696efe0 [IDE] Refine .gitignore for cmake from ide/srs_clion 2021-07-16 22:37:09 +08:00
winlin
2e222d369d [IDE] Refine CMakeLists.txt, use absolute path 2021-07-16 22:29:51 +08:00
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
 2021-07-16 11:38:12 +08:00
winlin
12ba584ea3 Fix build failed 2021-07-09 09:00:35 +08:00
winlin
dca0397c47 Update README 2021-07-09 08:13:36 +08:00
winlin
3182dee1c5 Update README.md 2021-07-08 18:03:38 +08:00
winlin
8f91a90f28 Squash: Fix padding packets for RTMP2RTC 2021-07-08 14:37:18 +08:00
winlin
a47c55a171 Merge branch '4.0release' into merge/develop 2021-07-08 14:36:23 +08:00
winlin
1e27fec8de Merge branch 'develop' into merge/develop 2021-07-08 14:36:17 +08:00
winlin
73e8133e84 Merge branch 'develop' into merge/develop 2021-07-08 14:32:56 +08:00
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
 2021-07-08 14:30:47 +08:00
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
 2021-07-08 14:27:51 +08:00
winlin
10b9a81061 RTC: Support eip/candidate to set the eip of server 2021-07-08 14:25:38 +08:00
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
 2021-07-08 14:23:53 +08:00
winlin
b121f5f588 Update SRS 4.0 docker 2021-07-08 12:56:43 +08:00
Winlin
77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 2021-07-08 09:54:55 +08:00
winlin
56310ffd9d Refine .curcleci workflow 2021-07-07 08:38:30 +08:00
winlin
481f8b203c Refine .curcleci workflow 2021-07-07 08:36:27 +08:00
winlin
14bc799029 Refine .curcleci workflow 2021-07-07 08:34:02 +08:00
winlin
5beea97e8e Refine .curcleci workflow 2021-07-07 08:32:07 +08:00
winlin
5a7a742f36 Squash: Update README 2021-07-06 11:37:31 +08:00
winlin
2538a74e36 Merge branch '4.0release' into merge/develop 2021-07-06 11:24:22 +08:00
winlin
ce1b09da28 Merge branch 'develop' into merge/develop 2021-07-06 11:24:16 +08:00
winlin
67ebd08342 Add role(srs) to query versions 2021-07-06 11:22:16 +08:00
winlin
a88eb5242e Update README.md 2021-07-04 17:04:57 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
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