Commit Graph

7685 Commits (eacaf61ac77ab7d5dc7b62df37ba9cc445a373c5)
 

Author SHA1 Message Date
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
winlin cbca6d94d1 Add API path document 4 years ago
winlin 98e56f5325 Refine the random id by srs_random_str 4 years ago
winlin 0391e71682 Squash: Merge SRS4 4 years ago
winlin d166354498 Merge branch '4.0release' into merge/develop 4 years ago
winlin a64827c0dd Merge branch 'develop' into merge/develop 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
Xiaoniu f986b5956b
check 'vhost' validity in 'http raw dvr api' (#2435) 4 years ago
winlin d02ba80db1 Squash: Fix bug for building FFmpeg 4 years ago
winlin 13ccf50773 Merge branch '4.0release' into merge/develop 4 years ago
winlin ae27bef823 Merge branch 'develop' into merge/develop 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
winlin 5ee20613ca Squash: Support query lastest available version. 5.0.6 4 years ago
winlin 6dc9ac311a Merge 4 years ago
winlin 6fa9f33f27 Merge branch 'develop' into merge/develop 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
Xiaoniu d987e194ff
fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438) 4 years ago