github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,482 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

4263 Commits (f072f3085491d7e87bd7bc7171ba8dd1bfc2d5c6)

Author SHA1 Message Date
winlin 29b9203428 For , , use short-term http connection for rtc to use new cid.
winlin 6118ca382a For , , http api success with message, timeout as such
winlin b5dd502103 For , , fix build warnings
HuyaJohn e8b2bb5d28 process err, do error check, add some error code
winlin c2a667cc35 For , , add comments for api and enum
winlin 2f0b150588 For , , accept srs_string_dumps_hex to app utility.
winlin e905fce847 For , , add comments in RTMP/RTP message for RTC.
winlin 9ba861f42f 3.0release is beta now
winlin a8ddd5afe7 For , refine inotify watch for relative path
winlin 8db2c3d821 For , refine inotify watch for relative path
winlin 9e856c84e7 For , , remove unused bash variable.
winlin 4b23d04635 For , , fix rtc player demo bug
winlin 60c8b37f05 For , , merge john, add NACK suport, remove debug code, verbose log
winlin c2916acd92 For , , define webrtc:// url for play
xiaozhihong 2b56f9ee59 add NACK suport, remove debug code, verbose log
winlin 12e99f1897 For , , use webrtc adapter.js for demo.
winlin a42cf3ae8d For , , refactor rtc config.
winlin 6f4584db53 Merge SRS4
winlin 51af2b4779 For , , rtc conf support ENV.
winlin a135eb2144 Merge SRS3
winlin 88336b1f5e Remove KAFKA config, because it's removed from code
winlin 70307ed8f9 Update README
xiaozhihong 6c88f58079 remove debug code, fix rtc.html
winlin d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc
xiaozhihong 768598a3bb add kernel rtp packet
xiaozhihong 027d34bbd3 add rtp shared packet
winlin a7c8980a60 For , muxing sh, use sound_rate if aac sr not set.
winlin 7036f839d2 For , add comments
winlin aa20a04abb For , fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13
winlin c66f33ac87
Merge pull request from runner365/3.0release.srt.dev 
support all aac sample rate in srt2rtmp
winlin 08bffc60fb Update install
xiaozhihong 6decdc7838 adjust code style, fix some bug, add rtc session timeout
winlin 1382337cb4 Merge SRS3
winlin 856ed5a971 For , inotify watch ConfigMap for reload. 3.0.134
winlin bb509d23e2 For , inotify watch ConfigMap for reload. 3.0.133
winlin 88368ed18d For , inotify watch ConfigMap for reload. 3.0.132
winlin 940798a9c7 For , inotify watch ConfigMap for reload. 3.0.131
runner365 f102a598b8 Merge branch 'develop' into 3.0release.srt.dev
runner365 b9195122cf support all sample rate in aac
winlin 5e60c8f9cc For , inotify watch ConfigMap for reload. 3.0.130
winlin 9b663c070a Fix , support auto reaload config by inotify. 3.0.129
winlin b33751e2c1 Merge SRS3
winlin 4b395f6e16 Fix , disable cache for stream changing, and drop dup header. 3.0.128
winlin ed41ca867b For , detect and disable daemon for docker. 3.0.127
winlin c1e07d6a96 For , always check status in thread loop. 3.0.126
winlin 6a765ab849 Merge SRS3
winlin 6c55fd3e4b For , refactor output with datetime for ingest/encoder/exec. 3.0.125
winlin c61c2a939f For , refactor output with datetime for ingest/encoder/exec. 3.0.125
HuyaJohn da72caf8b9 h264 packet done, chrome play well
winlin c78595c1fa For , refactor encoder output, support timestamp variables.
winlin 66b194cd63 For , refactor encoder process management.
winlin 927c0c8e39 For , fix quit by accident SIGTERM while killing FFMPEG. 3.0.124
xiaozhihong e831f3254a some code
HuyaJohn ff0e03800d h264 rtp debuging
xiaozhihong e2675109fb fix rtp h264 packet bug
HuyaJohn 3ae510b843 rtp dispatch done, but video can not play in chrome
xiaozhihong 2f462775a0 rtp support
HuyaJohn 2e68c375e3 start coding flv->rtp
xiaozhihong c62901a3ac make code easy, wrap udp remux socket
winlin 5586c2a128 For , refactor return value for RTSP initialize.
winlin dcb0553cc8 For , fix crash bug for RTSP. 4.0.12
winlin 12a74326e8
Merge pull request from xialixin/develop 
Fix disconnect RTSP connection has assertion, resulting in program exit
winlin 5f9ded73ce
Merge pull request from wasphin/feature/remove-unused-ip 
Remove unused ip variable
winlin 41acf9ca8e For , support sei_filter for SRT. 4.0.11
runner365 a2839aacdf add h264 sei filter
HuyaJohn b730458d51 add candidates ip list, add rtc_upload.html to test
runner365 4242985b36 update only support h264+aac
xiaozhihong a36ed6954f add rtc.html temp
xiaozhihong 936ba7583e modify depend.sh
xiaozhihong 9d5495c0c2 "stun and dtls done"
Xiaofeng Wang b525fc65aa Remove unused ip variable 
* "inet addr" is not compatible with rhel/centos 7+;
* ifconfig has been replaced by ip-utils in newer distro;
xiaozhihong 30d8b2209f parse sdp
runner365 40a09958c4 add checking for pes_parse
winlin 1b9a705e4b For , support mix_correct for aggregate aac packets. 4.0.10
winlin f917cc1e0c
For SRT, perfer mix_correct to true as default.
runner365 7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs
xiaozhihong 62563bdd81 rtc framework
runner365 ed1a3aa37c Merge branch 'develop' into 3.0release.srt.dev
winlin ea305790df For , refactor log for gracefully quit.
runner365 4bd37d43b4 solve dts==0 bugs; solve large aac 2930bytes timestamp bugs
winlin bbdbcf173c For , refactor the version and API for SRT.
winlin 04d0620dde For , fix build failed and srt api issue
winlin 90afd06c85 For , support default app(live) for vmix SRT. 4.0.9
winlin 771f07ee07 Merge branch 'develop' into 4.0release
winlin 1e998678f7
Merge pull request from runner365/3.0release.srt.dev 
update streamid decode for get more encoder such as VMIX
runner365 0dd72e0e5b Merge branch '3.0release.srt.dev' into 3.0release
runner365 bbfa552140 update streamid decode for get more encoder such as VMIX
xiaozhihong 51abb0844e rtp session manager, stun codding
winlin 67d78dff0e For , support SLB health checking by TCP. 4.0.8
winlin ef2b123325 Merge branch '3.0release' into 4.0release
winlin 20b9d6ab02 For , support SLB health checking by TCP. 3.0.123
xiaozhihong bc22ebe949 add rtc http request and response, exchange sdp.
winlin 4a69499f2c Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122
winlin 1d01ef499d For , support rolling update of k8s. 4.0.7
winlin ad3cfbfd2c For , support start/final wait for gracefully quit. 4.0.6
winlin 388ad61cdc Merge branch '3.0release' into 4.0release
winlin dc0f804452 For , support start/final wait for gracefully quit. 3.0.121
winlin d87f58a611 For , support gracefully quit and force to. 4.0.5
winlin 0c48c42f36 Merge branch '3.0release' into 4.0release
winlin 58b40478b6 For , support force gracefully quit. 3.0.120
winlin eefd74e0e4 Merge branch '3.0release' into develop
winlin 3c597545b1 For , support gracefully quit. 3.0.119
winlin e6c329293c Refine log
winlin f4c7b882c5 For , define signals for fast/grace quit and upgrade
夏立新 d6e11706ec Fix disconnect RTSP connection has assertion, resulting in program exit
夏立新 df3ec15cd1 Fix checking the completion of one frame data in RTSP RTP stream
winlin 5be69d290f For , flush async on_dvr/on_hls events before stop. 3.0.118
winlin 4e7e9809f3 Fix bash script bug for macOS, eventhough we don't support it.
winlin 0723b36f0e Merge branch '3.0release' into develop
winlin 131acf5bb0 For , migrating streaming from ossrs.net to r.ossrs.net. 3.0.117
winlin 4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net
winlin 23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net
Alex.CR ce4123f250
rtmp tcp listen port bugs in srt2rtmp () 
* update srt2rtmp about rtmp listen tcp port

* update srt2rtmp about rtmp listen tcp port
runner365 94741c1676 update srt2rtmp about rtmp listen tcp port
runner365 76204fa2ba Merge remote-tracking branch 'srs/develop' into 3.0release
runner365 8e40f9cf22 update srt2rtmp about rtmp listen tcp port
winlin 8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4
Alex.CR 9dad53691e
solve latency parameter error () 
* solve latency parameter error
runner365 d8419bd4dd solve latency parameter error
Alex.CR 5f7d23f123
add srt parameter configure () 
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs

* change two thread to one thread

* mpegts discard header is not 0x47

* add srt_epoll_clear_usocks

* add srt parameter configure
runner365 24f286684e add srt parameter configure
Alex.CR c2012379af
change srt epoll thread to one thread () 
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs

* change two thread to one thread

* mpegts discard header is not 0x47

* add srt_epoll_clear_usocks
runner365 6f4c124f58 solve merge confict
runner365 1a1d0e9267 add srt_epoll_clear_usocks
runner365 548c918efb mpegts discard header is not 0x47
runner365 4fdf242e99 change two thread to one thread
winlin d2a071f041 Add TODO for incompatible APIs of librtmp
Alex.CR 3847807534
solve srt repush bugs () 
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs
runner365 1c6203bda2 solve repush srt bugs
runner365 1941f55475 if there isn't srt connect, it needn't epoll wait
winlin bdc7973596 Merge branch '3.0release' into develop
winlin fc769550db Fix , fix HTTP-FLV reloading bug. 3.0.116
winlin f6fa889393 For , default ff_log_level to info
winlin c6d914bc13 Fix , fix terminal echo off by redirect process stdin. 3.0.115
winlin c50c51889a For , support ff_log_level and default to warning
winlin 2fa151726b For , rename ff_log_dir.
winlin 823b4fa56f Merge branch '3.0release' into develop
winlin a99cee2819 For , refactor security check. 3.0.114
winlin b9d45ba7d9 For , refactor security check. 3.0.114
winlin c51c378869 For , refactor security check. 3.0.114
winlin 3023dc7b40 Update project code. 4.0.3
winlin 55fa62e41f Update version4
winlin 59439cf8b5 Merge branch '3.0release' into develop
winlin c01806d5c4 Refine version3
winlin 4f39303f37 Fix , response right A/V flag in FLV header. 3.0.113
winlin 68efca4fa9 For , always enable fast FLV streaming.
winlin a2a6ca8258 For , always enable fast FLV streaming.
winlin fb555b4d8f Merge branch '3.0release' into develop
winlin c9a2e19b2f Support isolate version file. 3.0.112
winlin 77114c7df0 Merge SRS3
winlin 41f3925abc Add version file for srs3
winlin 23ece94064 Fix , dispose ingester while server quiting. 3.0.111
winlin a6f88805f3 Remove test code
winlin f18cc89860 Update version
winlin 31db28b70d Update version
winlin c90f441655 Update version
winlin 7c3b3608c0 Update version
winlin feca34ee59 Update version
winlin ec69b0786c Update version
winlin 6a514732b5 Update version
winlin afc0faf738 Use multiple revisions. 3.0.111
winlin deaa0f0f15 Update version
winlin 0fc026ef6b Update version
winlin 6ed6ce58e4 Merge SRS3
winlin adf7ef4511 Fix , racing condition in source fetch or create. 3.0.110
winlin b605edb9b3 Merge 3.0
winlin 5d365bade8 Fix , do not dispatch previous meta when not publishing. 3.0.109
winlin d9bbd97d72 Allow use libsrt.so for SRT is MPL license.
winlin 07f4bc65c3 Merge branch '3.0release' into develop
winlin 01870cce56 Allow use libst.so for ST is MPL license.
winlin d5c1546237 Update doc for SRT
winlin 88c9c13707 Update readme for SRT
winlin a7631a2850 Update doc
winlin fd3e4f406a Update doc
winlin ec3b442a42 Update doc
winlin c9f3706425 Move doc
winlin 2775a391e0 Fix , remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108
winlin 74154cdfd9 Fix , drop video data util sps/pps. 3.0.107
winlin a17c1e5f65 Merge SRT from runner365
runner365 8d277c6e8b solve merge problem
runner365 dece458a90 solve rtmp client timeout bugs in srt2rtmp
winlin bbc7023f85 Merge SRS3
winlin 978d5e993b Fix , reap DVR tmp file when unpublish. 3.0.106
winlin 5d0833fcc3 Add author runner365
winlin fddfbdde5f Fix , support SRT(Secure Reliable Transport). 4.0.1
winlin b7855d133d Merge remote-tracking branch 'runner365/3.0release.srt.dev' into srt
winlin 5f174552f3 Merge SRT
winlin 235c889e14 Update config
winlin e3169a080b Refactor SRT build, use libsrt.a static library
winlin 307a4315f1 Fix bug, should return error when wrapped
winlin 7c9b31815f Refactor code, add stop for hybrid server to do cleanup.
winlin db5788b205 Update README for SRT
winlin 2363d258de Refactor hybrid server model
winlin 33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP.
winlin 87ba204a42 Update doc for SRT url.
winlin 1959d1d920 Extract hybrid server for SRT
winlin 225c830971 Refine main run process
runner365 06e7a20b5f update streamid decode
winlin d88d422794 Update doc for SRT.
runner365 d7437834d4 update is_streamid_valid
winlin bc26df4893 Remove noused debug function srs_trace_data
winlin aacf519169 Revert log for forwarder in source
winlin a7b8695cb0 Refactor code, include without path
winlin f143757429 Use macro to disable SRT in code
winlin fb29096505 For SRT, allow/default disable it by --without-srt
winlin fb5928f927 Fix build failed for SRT with modules.
winlin 2de8d788f6 Revert configure changes(srs_ingest_hls,utest) in previous commit
winlin 106113c5f0 For previous revert, pick some code for LibSRTRoot
winlin a27c4f7095 Revert "remove modules for srt compile" 
This reverts commit d4c08c44d8.
winlin c7f6eef4ac Refine config file, link to issue.
winlin 65e8835fb5 Ignore .vscode in git.
winlin d28e82962d Ignore .vscode in git.
runner365 03ef01c635 update configure
runner365 d4c08c44d8 remove modules for srt compile
runner365 746d188e6f update srt.conf
runner365 5c5fd805c5 add srt mpegts to rtmp
winlin 6107db91f5 Release 3.0 alpha9, 3.0a9, 3.0.105
winlin c3bf0cbe1b For , check options for crossbuild.
winlin ba61fe8bc5 Fix , remove complex configure options. 3.0.104
winlin 0df108740a Fix , support crossbuild for ARM/MIPS.
winlin 6af8e38017 For , support setting cc/cxx/ar tools. 3.0.103
winlin a6fe4e80d3 For , remove the SRS_OSX macro in code
winlin 024433f327 For , refine configure, remove some macros
winlin 1bf90a6e21 Ignore noreply user.
l 86d04a70ed Fix , fix cid range problem. 3.0.102
winlin 9ac8585cf9 Fix codec check
winlin 3900179685 For , , define FLV CodecID for AV1 and Opus. 3.0.101
runner365 7b9e3ecdc4 add ts demux
winlin 9dbd049e79 For , extract SrsSourceManager from SrsSource.
winlin 0e750ab3eb For , use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100
winlin 7240fe3040 For , decrease the fast vector init size from 64KB to 64B. 3.0.99
winlin 857c783efc For , release coroutine when source is idle. 3.0.98
runner365 1481928b53 reject repeated srt pusher connection
runner365 b53b75ea1e srt pull/push server
winlin 816aa91a7f Fix utest bug, init fd
runner365 aeee3011ef add srt server file
winlin 98df29c6fb For , improve test coverage for service. 3.0.97
winlin 6c1067d56a Merge from 2.0
winlin dd46a4f700 Fix , support logrotate copytruncate. 2.0.272
winlin c08b6f1961 Merge 2.0, support logrotate copytruncate. 3.0.96
winlin 731e87876e Fix , support logrotate copytruncate. 2.0.271
Michael.Ma 459488bcf8 fix logrotate empty file hole issue () 
* fix logrotate empty file hole issue
refer to https://github.com/ossrs/srs/issues/1554
winlin 36bfbb902b Refien utest for log heaer generating.
winlin 80bac7d982 Improve test coverage for rtmp client service.
winlin cc11f36940 Improve test coverage for log service.
winlin 2cc021b2d7 Improve test coverage for http client service.
winlin 06c1d4d7f9 Fix some warnings for compiler
winlin 69e2d94e50 Fix some warnings for compiler
winlin 10464a5fbe Always use string instance to avoid crash risk. 3.0.95
winlin b794c9e4ec For , fix ipv6 hostport parsing bug. 3.0.94