Commit Graph

4069 Commits (c210c0b2f5e2de19d9b295c86f6f05dd20d78129)

Author SHA1 Message Date
winlin c1e07d6a96 For #1634, always check status in thread loop. 3.0.126 5 years ago
winlin 6a765ab849 Merge SRS3 5 years ago
winlin 6c55fd3e4b For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 5 years ago
winlin c61c2a939f For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 5 years ago
HuyaJohn da72caf8b9 h264 packet done, chrome play well 5 years ago
winlin c78595c1fa For #1634, refactor encoder output, support timestamp variables. 5 years ago
winlin 66b194cd63 For #1634, refactor encoder process management. 5 years ago
winlin 927c0c8e39 For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124 5 years ago
xiaozhihong e831f3254a some code 5 years ago
HuyaJohn ff0e03800d h264 rtp debuging 5 years ago
xiaozhihong e2675109fb fix rtp h264 packet bug 5 years ago
HuyaJohn 3ae510b843 rtp dispatch done, but video can not play in chrome 5 years ago
xiaozhihong 2f462775a0 rtp support 5 years ago
HuyaJohn 2e68c375e3 start coding flv->rtp 5 years ago
xiaozhihong c62901a3ac make code easy, wrap udp remux socket 5 years ago
winlin 5586c2a128 For #1612, refactor return value for RTSP initialize. 5 years ago
winlin dcb0553cc8 For #1612, fix crash bug for RTSP. 4.0.12 5 years ago
winlin 12a74326e8
Merge pull request #1612 from xialixin/develop
Fix disconnect RTSP connection has assertion, resulting in program exit
5 years ago
winlin 5f9ded73ce
Merge pull request #1625 from wasphin/feature/remove-unused-ip
Remove unused ip variable
5 years ago
winlin 41acf9ca8e For #1631, support sei_filter for SRT. 4.0.11 5 years ago
runner365 a2839aacdf add h264 sei filter 5 years ago
HuyaJohn b730458d51 add candidates ip list, add rtc_upload.html to test 5 years ago
runner365 4242985b36 update only support h264+aac 5 years ago
xiaozhihong a36ed6954f add rtc.html temp 5 years ago
xiaozhihong 936ba7583e modify depend.sh 5 years ago
xiaozhihong 9d5495c0c2 "stun and dtls done" 5 years ago
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;
5 years ago
xiaozhihong 30d8b2209f parse sdp 5 years ago
runner365 40a09958c4 add checking for pes_parse 5 years ago
winlin 1b9a705e4b For #1621, support mix_correct for aggregate aac packets. 4.0.10 5 years ago
winlin f917cc1e0c
For SRT, perfer mix_correct to true as default. 5 years ago
runner365 7f4cc6221c 1,solve audio timestamp bugs;2,solve video dts increase bugs 5 years ago
xiaozhihong 62563bdd81 rtc framework 5 years ago
runner365 ed1a3aa37c Merge branch 'develop' into 3.0release.srt.dev 5 years ago
winlin ea305790df For #1579, refactor log for gracefully quit. 5 years ago
runner365 4bd37d43b4 solve dts==0 bugs; solve large aac 2930bytes timestamp bugs 5 years ago
winlin bbdbcf173c For #1615, refactor the version and API for SRT. 5 years ago
winlin 04d0620dde For #1615, fix build failed and srt api issue 5 years ago
winlin 90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 5 years ago
winlin 771f07ee07 Merge branch 'develop' into 4.0release 5 years ago
winlin 1e998678f7
Merge pull request #1615 from runner365/3.0release.srt.dev
update streamid decode for get more encoder such as VMIX
5 years ago
runner365 0dd72e0e5b Merge branch '3.0release.srt.dev' into 3.0release 5 years ago
runner365 bbfa552140 update streamid decode for get more encoder such as VMIX 5 years ago
xiaozhihong 51abb0844e rtp session manager, stun codding 5 years ago
winlin 67d78dff0e For #1598, support SLB health checking by TCP. 4.0.8 5 years ago
winlin ef2b123325 Merge branch '3.0release' into 4.0release 5 years ago
winlin 20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 5 years ago
xiaozhihong bc22ebe949 add rtc http request and response, exchange sdp. 5 years ago
winlin 4a69499f2c Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122 5 years ago
winlin 1d01ef499d For #1579, support rolling update of k8s. 4.0.7 5 years ago
winlin ad3cfbfd2c For #1579, support start/final wait for gracefully quit. 4.0.6 5 years ago
winlin 388ad61cdc Merge branch '3.0release' into 4.0release 5 years ago
winlin dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 5 years ago
winlin d87f58a611 For #1579, support gracefully quit and force to. 4.0.5 5 years ago
winlin 0c48c42f36 Merge branch '3.0release' into 4.0release 5 years ago
winlin 58b40478b6 For #1579, support force gracefully quit. 3.0.120 5 years ago
winlin eefd74e0e4 Merge branch '3.0release' into develop 5 years ago
winlin 3c597545b1 For #1579, support gracefully quit. 3.0.119 5 years ago
winlin e6c329293c Refine log 5 years ago
winlin f4c7b882c5 For #1579, define signals for fast/grace quit and upgrade 5 years ago
夏立新 d6e11706ec Fix disconnect RTSP connection has assertion, resulting in program exit 5 years ago
夏立新 df3ec15cd1 Fix checking the completion of one frame data in RTSP RTP stream 5 years ago
winlin 5be69d290f For #1601, flush async on_dvr/on_hls events before stop. 3.0.118 5 years ago
winlin 4e7e9809f3 Fix bash script bug for macOS, eventhough we don't support it. 5 years ago
winlin 0723b36f0e Merge branch '3.0release' into develop 5 years ago
winlin 131acf5bb0 For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117 5 years ago
winlin 4276bea463 Migrating streaming service from ossrs.net to r.ossrs.net 5 years ago
winlin 23324cde31 Migrating streaming service from ossrs.net to r.ossrs.net 5 years ago
Alex.CR ce4123f250
rtmp tcp listen port bugs in srt2rtmp (#1602)
* update srt2rtmp about rtmp listen tcp port

* update srt2rtmp about rtmp listen tcp port
5 years ago
runner365 94741c1676 update srt2rtmp about rtmp listen tcp port 5 years ago
runner365 76204fa2ba Merge remote-tracking branch 'srs/develop' into 3.0release 5 years ago
runner365 8e40f9cf22 update srt2rtmp about rtmp listen tcp port 5 years ago
winlin 8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 5 years ago
Alex.CR 9dad53691e
solve latency parameter error (#1600)
* solve latency parameter error
5 years ago
runner365 d8419bd4dd solve latency parameter error 5 years ago
Alex.CR 5f7d23f123
add srt parameter configure (#1599)
* 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
5 years ago
runner365 24f286684e add srt parameter configure 5 years ago
Alex.CR c2012379af
change srt epoll thread to one thread (#1597)
* 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
5 years ago
runner365 6f4c124f58 solve merge confict 5 years ago
runner365 1a1d0e9267 add srt_epoll_clear_usocks 5 years ago
runner365 548c918efb mpegts discard header is not 0x47 5 years ago
runner365 4fdf242e99 change two thread to one thread 5 years ago
winlin d2a071f041 Add TODO for incompatible APIs of librtmp 5 years ago
Alex.CR 3847807534
solve srt repush bugs (#1596)
* if there isn't srt connect, it needn't epoll wait

* solve repush srt bugs
5 years ago
runner365 1c6203bda2 solve repush srt bugs 5 years ago
runner365 1941f55475 if there isn't srt connect, it needn't epoll wait 5 years ago
winlin bdc7973596 Merge branch '3.0release' into develop 5 years ago
winlin fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 5 years ago
winlin f6fa889393 For #1592, default ff_log_level to info 5 years ago
winlin c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 5 years ago
winlin c50c51889a For #1592, support ff_log_level and default to warning 5 years ago
winlin 2fa151726b For #1592, rename ff_log_dir. 5 years ago
winlin 823b4fa56f Merge branch '3.0release' into develop 5 years ago
winlin a99cee2819 For #1186, refactor security check. 3.0.114 5 years ago
winlin b9d45ba7d9 For #1186, refactor security check. 3.0.114 5 years ago
winlin c51c378869 For #1186, refactor security check. 3.0.114 5 years ago
winlin 3023dc7b40 Update project code. 4.0.3 5 years ago
winlin 55fa62e41f Update version4 5 years ago
winlin 59439cf8b5 Merge branch '3.0release' into develop 5 years ago
winlin c01806d5c4 Refine version3 5 years ago