github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,131 Commits
13 Branches
107 Tags
371 MiB
develop
5.0release
6.0release
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ab97eb5fcf'
${ noResults }
Commit Graph

5745 Commits (ab97eb5fcf03e8d16a877931e7066f9ee79c9fcc)

Author SHA1 Message Date
Haibo Chen 529b89a29e Fix #2504 coredump bug: caused by publish stream that codec is h.263 (#2505) 4 years ago
winlin 6ddef894d9 ST: Refine OSX asm. 4 years ago
Haibo Chen 82c149c9c8 correct the client ip of http-flv player, for statistic (#2491) 4 years ago
winlin 7d4cae45c5 Release 4.0 dev1, v4.0.146 4 years ago
winlin 40e649dfbc RTC: Fix NACK negotiation bug for Firefox. 4.0.145 4 years ago
Winlin 8c7ba05f9a
For #2371: Add regression test for SDP nack (#2487) 
* explicitly enable nack, for firefox (#2373)

* For #2371: Add regression test for SDP nack

1. Refine API to change defaule decodes.
2. Add test for publish SDP nack.
3. Add test for play SDP nack.

Co-authored-by: Haibo Chen <495810242@qq.com>
 4 years ago
Haibo Chen 43bb9660ca explicitly enable nack, for firefox (#2373) 4 years ago
Winlin fe5a14568b
For #2483, add regression test for RTC stat API (#2486) 4 years ago
Haibo Chen 86c67f7d95 RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) v4.0.144 
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
 4 years ago
Alex.CR af05f89925 SRT: Use thread-safe log for multiple-threading SRT module. (#2474) v4.0.143 
* 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

* optimize srt log system

* update conf

* update srt hpp

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
winlin 169f08bae1 [IDE] We should always configure SRS for switching between branches. 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
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
Winlin 77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 4 years ago
winlin 67ebd08342 Add role(srs) to query versions 4 years ago
winlin 642359a50e For #2424, use srandom/random to generate. 4.0.139 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
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 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
winlin 98e56f5325 Refine the random id by srs_random_str 4 years ago
winlin 6ea270adf3 Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136 4 years ago
Xiaoniu 31679c46d4 check 'vhost' validity in 'http raw dvr api' (#2435) 4 years ago
winlin bfae75077e Fix #2431, configure FFmpeg bug. 4.0.135 4 years ago
winlin c8d8581d4b For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134 4 years ago
Hung-Yi Chen bbd9d864d5
Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444) 4 years ago
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)
 4 years ago
winlin aa12251084 Fix bug for v3.0-r6 4 years ago
winlin da763e43d5 Squash for #2424, query the latest available version. 4.0.132 4 years ago
winlin 25262dd3cb Fix SRT bug. 4.0.131 4 years ago
Alex.CR bb9aefd869 srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
winlin fed57f6f17 Refine scripts 4 years ago
winlin 5906345a97 Fix #2413, fix RTMP to RTC bug 4.0.130 4 years ago
john 1347da81f8
Check audio/video track when rtc stream updated (#2418) 4 years ago
winlin 3aba2f3479 Add machine to build dir 4 years ago
winlin 70e552ef23 Guess where FFmpeg is. 4.0.129 4 years ago
winlin 6038276b4e Fix bug for build on osx 4 years ago
winlin 440883e6e6 Fix bug for 'make st' 4 years ago
winlin a52e7c08ea Update AUTHORS 4 years ago
winlin 229578cc65 Fix #1685, support RTC cross-build for armv7/armv8(aarch64). 4.0.128 4 years ago
winlin 1e9de0e191 For #1685: Cross build RTC with FFmpeg 4 years ago
winlin 1c75a270b3 RTC: Eliminate dead code. 4 years ago
winlin 623a453787 Fix #2214, remove detection for gmc and gmp. 4 years ago
winlin df20fe6c9d Fix build fail 4 years ago
winlin 68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 4 years ago
winlin d5266725e2 Build: Support --shared-ffmpeg to link with *.so for LGPL license. 4.0.126 4 years ago
winlin d1d0b9ca5c Doc: Update 3rdparty links 4 years ago
winlin f44224a2a1 Build: Support --shared-srt to link with *.so for MPL license. 4.0.125 4 years ago
winlin 8434271578 Build: Refine configure option help 4 years ago
winlin 689100f651 Refine AUTHORS format 4 years ago
winlin 67272f0721 Fix build fail for SPDX 4 years ago
winlin 3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 4 years ago
winlin 4cf1f852cf Fix bugs for GB28181 and RTC. 4.0.123 4 years ago
johzzy 7be6025546 fix: fix typo about inactive. (#2380) 4 years ago
louis.xia 1c7c74b01a GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 4 years ago
cfw11 3e7536c493 GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 4 years ago
winlin c353f1fe57 Update Usage 4 years ago
winlin bd1ec99d5b Demo: Update srs.sdk.js 4 years ago
winlin 8e79b90bc3 RTC: Eliminate dead code. 4.0.122 4 years ago
winlin 5df90a2a1c Fix #2370 bug for Firefox play stream(published by Chrome). 4.0.121 4 years ago
winlin 7ea05dddf2 RTC: Allow set constrain for publisher 4 years ago
winlin 9ed388523f RTC: Refine demo H5 page 4 years ago
winlin 37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 4 years ago
winlin 1ba0b20b74 Refine commens 4 years ago
winlin 0c1e60c8df Tools: Refine configure options. 4.0.119 4 years ago
winlin 9e5c4e2c5b RTC: Fix build fail 4 years ago
winlin fc9363e7df Fix build fail when disable RTC by --rtc=off. 4.0.118 4 years ago
winlin af04285baa Tools: Remove srs-librtmp 4 years ago
winlin 3fb6433c9e Tools: Ignore some unused options 4 years ago
winlin 55baa81cea Tools: Refine --arm with --rtc=off 4 years ago
chenhaibo bd506da070 Fix #2366, bug when disabled gb28181. 4 years ago
winlin 8f304b94ec Refine comments 4 years ago
root d55af6be44 Fix #2362: Allow WebRTC to play before publishing, for GB28181 as such. 4.0.117 4 years ago
winlin ef617b5fc6 Demo: Refine H5 demo page 4 years ago
Xiaoniu 75607d0723 Fix #2364: Live: Fail for stream busy if GB28181 is publishing. 4 years ago
winlin 476e114cc4 Update doc 4 years ago
winlin 0d14c4b073 System: Fail if use use full.conf 4 years ago
winlin 1bd6bfd142 GB28181: Rename sip and jitter file. 4 years ago
xialixin 4c2b19a264 GB28181: Refine for bad network, we can wait for more incomplete frames 4 years ago
xialixin 7d8bde3cdb Fix #2355: GB28181: Fix play by RTC bug. 4.0.116 4 years ago
winlin 4639510f1b RTC: Allow config perf_stat and queue_length of rtc_server 4 years ago
winlin edbb9cb238 Add FFmpeg LICENSE 4 years ago
hondaxiao 90f1b482ab SRT: Build SRT from source by SRS. 4.0.115 4 years ago
winlin 262f0fc8c8 SRT: Enable HTTP-FLV for SRT 4 years ago
winlin 3dce568b9c Rename SrsConsumer* to SrsLiveConsumer*. 4.0.114 4 years ago
winlin dae6dc5395 Rename SrsRtcStream* to SrsRtcSource*. 4.0.113 4 years ago
winlin 2dd58665fa Rename SrsSource* to SrsLiveSource*. 4.0.112 4 years ago
winlin 9b6a1b16e1 RTC: Eliminate unused perf_stat 4 years ago
winlin ddd7a378b1 Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111 4 years ago
winlin ab0979a4ea RTC: Remove DTLS utests, cover by regression test 4 years ago
winlin f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 4 years ago
winlin 717e811002 Change virtual public to public. 4.0.109 4 years ago
winlin 53e20d4a37 RTC: Eliminate unused stat code 4 years ago
winlin cd45750c9d RTC: Eliminate unused stat API 4 years ago
winlin 06f7d7d11b Refine id and vid for statistic. 4.0.108 4 years ago
winlin 393d976685 SquashSRS4: Fix memory leak 4 years ago
winlin 9cbdf29f7d SRT: Fix build fail bug, add ssl 4 years ago
winlin 996c7d5697 SquashSRS3: Fix bug 4 years ago
winlin 8c5a435714 Fix print bug in retrieve_local_ips. 4.0.107 4 years ago
winlin 6dc93fe0a8 RTC: Update benchmark data 4 years ago
winlin 3bf1b0cb7d Refine tid for sdk and demos. 4.0.106 4 years ago
winlin 2ad24b2313 Refine shared fast timer. 4.0.105 4 years ago
winlin f370259c9d Fix build fail 4 years ago
winlin 4cf6da107c Refine init of global objects 4 years ago
winlin 8b58d18a5a Refine init of global objects 4 years ago
winlin b1e85664a1 Refine init of global SrsPps 4 years ago
winlin b6f2745822 Refine init of global variables 4 years ago
winlin e8f7c913b0 Refine global or thread-local variables initialize. 4.0.104 4 years ago
winlin e7cce88912 RTC: Refine timer stat 4 years ago
winlin 25f17c32e9 RTC: Refine fast timer 4 years ago
winlin 92fc0af8f4 RTC: Support circuit breaker. 4.0.103 4 years ago
winlin 46c980c70a RTC: Eliminate unused code 4 years ago
winlin 4527a91545 RTC: Refine play stream find track. 4.0.102 4 years ago
winlin b823dcdfd7 RTC: Refine FastTimer to fixed interval. 4.0.101 4 years ago
winlin 0c0b467917 RTC: Transform config for nack/twcc. 4.0.100 4 years ago
winlin b41788ca4a RTC: Fix config bug for nack and twcc. 4.0.99 4 years ago
winlin 4f48ad7a8b RTC: Fix config check bug for nack and twcc 4 years ago
winlin 320bff49e0 Update demos 4 years ago
winlin 37f051f16d Update console 4 years ago
winlin 1e27db6a7d Update players 4 years ago
winlin a39ff09f2a Tools: Add wx-video brocasting for demo 4 years ago
winlin 5405494de8 Tools: Refine one to one RTC demo 4 years ago
winlin 6e26da2323 Tools: Refine sig sdk for demo 4 years ago
winlin 700186b1c8 Tools: Refine random room and display for demo 4 years ago
winlin 81a87d07f6 Add video room demo. 4.0.98 4 years ago
winlin bfeca8e068 Tools: Add video room demo 4 years ago
winlin b42bf496c7 Tools: Update script 4 years ago
winlin 9fb2b69212 Add RTC stream merging demo by FFmpeg. 4.0.97 4 years ago
winlin aa9c4e8604 Tools: Refine one to one demo 4 years ago
winlin ea417201b3 Tools: Copy to gits 4 years ago
winlin 74043b4153 Tools: Update one to one demo 4 years ago
winlin fc23b9e5f5 Tools: Refine script 4 years ago
winlin 2783ac7c92 Tools: Sync 3rdparty tools 4 years ago
winlin dea6136238 Copy demos to SRS release 4 years ago
winlin 5e6fe49da1 Add one to one demo for no-localhost 4 years ago
winlin 5a611e0c4b Add one to one demo. 4.0.96 4 years ago
winlin f7473c90bc For #2303: Add conf for RTC2RTMP 4 years ago
winlin 8a30cc86d9 Bridger: Fix build fail if disable rtc and ffmpeg-fit 4 years ago
winlin 3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 4 years ago
winlin c770e6d7bc Bridger: Start RTMP2RTC bridger in RTMP publisher 4 years ago
winlin c10232b4e2 Bridger: Refine transcoder to support aac2opus and opus2aac. 4.0.94 4 years ago
winlin 00c192ede1 Timer: Apply shared FastTimer to RTC server. 4.0.93 4 years ago
winlin 8747dd6630 Timer: Extract shared FastTimer to use one timer for all connections 4 years ago
winlin 659e173e15 RTC: Refine for writing doc. 4.0.92 4 years ago
winlin 165f97e4a0 SquashSRS3: Link source flv in doc 4 years ago
Winlin e8fe66e3ba
RTC: Support av1 for Chrome M90 enabled it. 4.0.91 (#2324) 
* RTC: Support av1 for Chrome M90 enabled it. 4.0.91

* RTC: Show codec for WebRTC publisher
 4 years ago
winlin a9d39f6946 RTC: Refine API params to create connection 4 years ago
winlin 51aa899358 RTC: Refine H5 demo, extract srs.sdk.js 4 years ago
winlin a5727c373a Script: Remove unused git2unix.sh 4 years ago
winlin 7cae97e4d3 SquashSRS3: Update players 4 years ago
winlin db37a4ac02 SquashSRS3: Add crossdomain.xml for install script. 4 years ago
winlin 5516d3751f Change push-RTSP as deprecated feature. 4 years ago
winlin 6f66cf0868 Player: Change the default from RTMP to HTTP-FLV. 4 years ago
winlin 5232f9e043 Disable CherryPy by --cherrypy=off. 4.0.90 4 years ago
winlin de1c7522f0 SquashSRS3: Add console 4 years ago
winlin 9ed7565789 SquashSRS3: Package srs-console 4 years ago
winlin cec0191b16 Happy 2021 4 years ago
winlin 124455be09 Update script 4 years ago
winlin d01e603b25 Happy 2021 4 years ago
stone 6da91f7dea For #2275, fix bug for transcode engine config param. 4 years ago
winlin aae0f61165 RTC: Eliminate the dup code 4 years ago
winlin 061f367a82 RTC: Fix RTC connection dispose bug 4 years ago
winlin db7e820f04 RTC: Fix DTLS warnings for HTTP api 4 years ago
winlin 96003d4a52 RTC: Fix bug for republish stream. 4.0.89 4 years ago
winlin 8d9dd532b9 RTC: Fix bug for republish stream. 4.0.89 4 years ago
winlin 3c59fedab6 RTC: Fix memory leak 4 years ago
winlin 7823d75a38 RTC: Refine payload NALU type parser 4 years ago
winlin aa5d872b8c RTC: Refine TWCC and SDP exchange. 4.0.88 4 years ago
winlin bd1752a4b2 RTC: Fix TWCC send bug 4 years ago
winlin 7ac4a4f4ca RTC: Fix audio track description bug 4 years ago
winlin f4b791a9d5 Kernel: Never assert for SrsBuffer::require 4 years ago
winlin 4d5c7e0a73 RTC: Fix object cache bug, reset payload when recycle 4 years ago
winlin f2d0c34244 RTC: Refine comments for SrsRtpPacket2 4 years ago
winlin d6c16a7e23 RTC: Support WebRTC re-publish stream. 4.0.87 4 years ago
winlin 0cb05a2953 RTC: Refine ID parsing 4 years ago
winlin 89f941fadc Refine version file 4 years ago
winlin 6c7e24fc6d RTC: Eliminate dead code, we nerver send offer 4 years ago
winlin 4c39cc7c2f RTC: Use fast parse TWCCID, ignore in packet parsing. 4.0.86 
1. TWCC should not be passed from end to end.
2. Publisher TWCC information, should be ignore when pass to player
3. Player should regenerate its own TWCC.
 4 years ago
winlin f5ff28d47a RTC: Refine play stream init 4 years ago
winlin 3fea5c0ec3 Test: Add republish regression test, should fail 4 years ago
winlin bb37a5550c Test: Update srs-bench 4 years ago
winlin a3dbb22696 Fix bugs. 4.0.85 4 years ago
winlin a53fe451ff RTC: Feed TWCC then drop the specified PT packet. 
1. Sometimes we might drop RTP packets, by PT(payload type).
2. For example, the padding packets from client.
3. We should feed these packets to TWCC, then drop it.
 4 years ago
winlin 7f8df6f21f Build: Refine script for SRTP. 
Because we have upgraded to openssl-1.1.1d and libsrtp-2.3,
so it's able to enable ASM for SRTP for not only openssl-1.0,
because libsrtp-2.3 fixed the capacity bug.
 4 years ago
winlin f066914968 Test: Add missing files. 4 years ago
winlin 27d4080084 Test: Fix check file bug 4 years ago
winlin 030b94e717 Test: Add missing files for srs-bench 4 years ago
winlin 06f2e1462e DTLS: Update regression tests 4 years ago
winlin d4d11c2c18 DTLS: Change max loop to larger 4 years ago
winlin 62987aa01f DTLS: Refine retransmit between ClientHello and Certificate. 4 years ago
winlin 02aac0fea4 DTLS: Fix ARQ bug, use openssl timeout. 4.0.84 4 years ago
winlin 3c6e466280 DTLS: Use specified init API, to decrease packet size 4 years ago
winlin 3a5d88b435 DTLS: Disable QueryMTU for openssl, or the packet get fragmented 4 years ago