Commit Graph

6243 Commits (ec5bdc7dfa2e6ee271caea56094e276e5d3f2f41)

Author SHA1 Message Date
winlin a6c4cc9692 Squash: Merge SRS 4.0, API: Always stat client event if auth fail. 3 years ago
winlin 5783c4420f For #2689: Support stat for CPU archs. 3 years ago
winlin 99904f9ec2 For #2689: Support stat for CPU archs. 3 years ago
winlin 5b44cc6a17 For #2689, Support loongarch, loongson CPU. v5.0.19 3 years ago
Haibo Chen 592d4964ef API: Always stat client event if auth fail. v4.0.183 3 years ago
Haibo Chen a86f3905b2
Put the statistics code after http callback (#2687) 3 years ago
winlin f0910cf9b7 Squash: For #1758: Fix bug for marshal JSON with SDP. 3 years ago
winlin 31693d4b61 For #1758: Fix bug for marshal JSON with SDP. 3 years ago
winlin 665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 3 years ago
xmedia-systems 34b968aabf JSON: Support escape special chars. (#1758) v4.0.182 3 years ago
Matheus Macabu 061d544195 RTMP: If port is explicity set to 0, use default 1935 (#1754). v4.0.181 3 years ago
Matheus Macabu 9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 3 years ago
winlin 85131dad63 Squash: Update SRS 4.0 version 3 years ago
Alex.CR bb7cd6af3a SRT: Solve mpegts demux assert bug (#2670) v4.0.180
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
3 years ago
Alex.CR 60c8724879
SRT: Solve mpegts demux assert bug (#2670)
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
3 years ago
winlin 596dd8c523 Support daemon(fork twice) for Darwin/OSX. v5.0.18 3 years ago
Haibo Chen 7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 3 years ago
winlin e03ada39a1 Squash: SRS v4.0.179 3 years ago
Haibo Chen 3fc287f7de API: Fix the same 'client_id' error when asynchronous call (#2665) v4.0.179 3 years ago
Haibo Chen 974bed6b26
API: Fix the same 'client_id' error when asynchronous call (#2665) 3 years ago
winlin 9517ef123d Squash: Update SRS 4.0 version 3 years ago
Alex.CR 1649386ed5 SRT: Pes error when mpegts demux in srt. v4.0.178
* solve mpegts demux bug

* solve pes error when mpegts demux
3 years ago
Alex.CR 44f1d8ed6d
SRT: Pes error when mpegts demux in srt (#2671)
* solve mpegts demux bug

* solve pes error when mpegts demux
3 years ago
winlin cd7e5a131e Squash: SRS 4.0, Stat the oc(origin cluster). 3 years ago
winlin 18a155bf31 API: Stat the oc(origin cluster). 3 years ago
winlin 533e86eaf8 API: Stat the oc(origin cluster). 3 years ago
winlin 135bef2182 Test: Update srs-bench depends 3 years ago
winlin e127880ec2 Squash: Merge SRS 4.0 3 years ago
Haibo Chen a2003b3a85 API: Use publish param instead of play (#2550) v4.0.177 3 years ago
Haibo Chen 579b90dc1e
on_dvr: use publish param instead of play (#2550) 3 years ago
winlin 4e6a3321cd Squash: Merge SRS 4.0 3 years ago
winlin 5d5df7923b Config: If docker.conf does not exists, try srs.conf 3 years ago
Haibo Chen eb3bbf1bca For #2549: Fix duration issue for HLS on_hls. v4.0.176 3 years ago
Haibo Chen 93cd025e2a
replace the placeholder of ts url in m3u8 (#2549) 3 years ago
winlin b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 3 years ago
winlin d6064ac608 UTest: Fix utest fail for config 3 years ago
winlin 29cf13afa0 Fix #1641, HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 3 years ago
winlin 71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 3 years ago
winlin fe9e43b6d4 RTC: Refine config for RTC 3 years ago
winlin 0b99f06eff Test: Add RTMP to RTC regression test. 3 years ago
winlin f8b4121497 Test: Add Multiple Sequence test for RTMP 3 years ago
winlin 29b98c49cc Test: Refine RTMP regression test. 3 years ago
winlin 9c315c94fc For #1641, Support RTMP publish and play regression test. v4.0.173 3 years ago
winlin 0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 3 years ago
winlin a81aa2edc5 Squash: Merge SRS 4.0 3 years ago
winlin 2fa5a0bee8 Fix #2304, Remove Push RTSP feature. v4.0.171 3 years ago
winlin 9edf63bd30 3rdparty: Sync httpx-static 3 years ago
winlin df53c801b2 For #2653: Update config for HTTP RAW API removed. 3 years ago
winlin cf99ebf186 Fix #2653: Remove HTTP RAW API. v4.0.170 3 years ago
winlin 19e857ada4 Remove dead link for issues 3 years ago
winlin 2ac214fdc6 For #2654: Parse width and width from SPS/PPS. v4.0.169 3 years ago
bepartofyou 286a605c63 Fix #2654: Parse width and width from SPS/PPS. Fix #471, #1335, #2539, #1316, #1421 3 years ago
winlin 55d8cb4b7b Default to log to console for docker. v4.0.168 3 years ago
winlin 1acb80b9c8 Enable WebRTC for srs.conf 3 years ago
winlin 6c597facfb Squash: Merge SRS 4.0 3 years ago
winlin 4f77ddbc06 Fix bugs #2648, #2415. v4.0.167 3 years ago
winlin 5042117034 Squash: Merge SRS 4.0 3 years ago
ChenGH 7a4de9ffe7
Fix #2415, refine dtls fragment and rtp payload size (#2652) 3 years ago
ChenGH 0093a54b34
fix bandwidth kbps caculate bug (#2648) 3 years ago
winlin a19c0fa121 OpenWRT: Try to create dir for pidfile 3 years ago
winlin 8ea9783de7 OpenWRT: Disable mprotect of ST. 5.0.16 3 years ago
winlin 9d54bcd114 Actions: Show commit and messages. 3 years ago
winlin cae35d7a6e Actions: Show commit and messages. Fix MIPS build fail. 3 years ago
winlin 8685c9c12c OpenWRT: Support cross-compile SRS 3 years ago
winlin b6d02a51b8 OpenWRT: Fix build issues 3 years ago
winlin c48c9603c0 Actions: Create source tar lik srs-server-5.0.14.tar.gz 3 years ago
winlin efbff98046 Actions: Create source tar lik srs-server-4.0.165.tar.gz 3 years ago
winlin 4b37f650f7 Actions: Support create release with source tar automatically. v5.0.13 3 years ago
winlin 38f0109b21 Actions: Support create release with source tar automatically. v4.0.164 3 years ago
winlin 96a33b5748 ST: Support Cygwin64 and MIPS. 5.0.13 3 years ago
winlin 1836847269 ST: Support Cygwin64 and MIPS 3 years ago
winlin 7d3ec991e1 Squash: Merge SRS 4.0 3 years ago
winlin ad4b648ed2 For #2545, Refine code with space lines. 3 years ago
johzzy ee23e3abed fix some crash in rtc. (#2545) 3 years ago
johzzy dc778020fc
fix some crash in rtc. (#2545) 3 years ago
winlin 81fa762b4f Update the SRS logo 3 years ago
winlin 149ad80b5d Squash: Merge SRS 4.0 3 years ago
winlin 10fe04ac18 LIVE: Add conf/live.conf for RTMP/FLV/HLS 3 years ago
winlin 34cd7b2586 Squash: Merge SRS 4.0 3 years ago
winlin 79d73bafcf Refine code space 3 years ago
winlin c8d3542979 Fix build failed. 3 years ago
winlin f01c9638f1 Support http callback on_play/stop. 5.0.12 3 years ago
winlin 31672806aa For #2618, #2578, SRS 4.0.163 3 years ago
Haibo Chen 36b813b971 Enhance HLS: support http callback on_play/stop, support statistic (#2578)
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
3 years ago
Haibo Chen f901831362
Enhance HLS: support http callback on_play/stop, support statistic (#2578)
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
3 years ago
zozobreakzou 46adcfb6c9
[rtc] *Fix Fua package bug(payload size minus one). (#2618)
* This can cause webrtc video PacketBuffer assemble corrupt when (nal size - 1) % 1300 == 0
* issues about webrtc all caused by this bug
3 years ago
winlin 40f8460929 Squash: Merge SRS 4.0 3 years ago
winlin 4456a275b6 PushFLV: Fix bug, add stat 3 years ago
winlin 5828d64a3d For #2613, #2614, #2454, v4.0.162 3 years ago
Winlin 560e7c3c2f
Fix #2613, Try libopus and opus for ARM (#2614)
* Fix #2613, Try libopus and opus for ARM

* Refine code
3 years ago
winlin 28e3a1ca69 Squash: Merge SRS 4.0 3 years ago
winlin 501b3833a1 RTMP: Remove bandwidth test 3 years ago
winlin a830289d97 Squash: Merge SRS4.0 3 years ago
Justin Kromlinger a583d7efb4 Set empty HTTP paths to '/' to avoid malformed requests (#2329)
This resolves #1610.
3 years ago
Justin Kromlinger 8aee0169ce
Set empty HTTP paths to '/' to avoid malformed requests (#2329)
This resolves #1610.
3 years ago
Huachao Mao ff9e2339c1
Fix stream api iterator not incremented (#2582) 3 years ago
Huachao Mao 53cb333713
Support pagination for stream api (#2572) 3 years ago
winlin 19c0a9eb4b Suqash: Merge 4.0 3 years ago
winlin ec554e14d0 Merge #2581, Fix listen ipv6 and port. 4.0.161 3 years ago
ChenGH 3f94d26ca4
For #1920, refine rtmp listen ip and port check (#2581) 3 years ago
ChenGH 714e182096
fix srs_string_replace deap loop when new_str inclue old_str (#2580) 3 years ago
winlin 6bb11a72d0 For #2282, #2181, Move DVR async worker from SrsDvrPlan to global. 3 years ago
winlin 90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 3 years ago
BoringWednesday 1db155fa2f
SRT: Add member of adaptation_field and fix pos not add after memcpy. (#2066) 3 years ago
winlin cf3129220d Log: Refine the tail help log, show last 30 lines 3 years ago
winlin 7ab3e4a86c Squash: Merge SRS 4.0 4 years ago
winlin b6d0c73cda For #1859, Enhancement: Add param and stream to on_connect. 4.0.159 4 years ago
pyw 7abc9b640a
SRT: fix srt stream play map error (#1890)
* fix url_sz memory out of bounds

* fix srt play map error

Co-authored-by: pengyouwei <pengyouwei@comtom.cn>
4 years ago
Matin Zadeh Dolatabad 7b14281367
Enhancement: Add param and stream to on_connect (#1859)
Add stream and param to hook call on_connect for better use
4 years ago
winlin f86d6fd073 Squash: Merge SRS 4.0 4 years ago
Haibo Chen c4a64ee470 Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542)
* Use SrsAsyncCallWorker in http hooks instead, to covert to async call.

* delete invalid function
4 years ago
Haibo Chen a7feedabc6
Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542)
* Use SrsAsyncCallWorker in http hooks instead, to covert to async call.

* delete invalid function
4 years ago
Haibo Chen c8bf98e8e2 Support for multiple SPS/PPS, then pick the first one. (#2544) 4 years ago
Haibo Chen 826f5121c5
Support for multiple SPS/PPS, then pick the first one. (#2544) 4 years ago
winlin 38b0b1dab2 Squash: Fix ingest bug. Refine AUTHORS. 4 years ago
winlin 23730fa483 Update AUTHORS 4 years ago
rise a00b4d2014
Ingest: Exit if child process redirect io failed (#2540)
* 修复子进程无法打开日志输出重定向导致的fork错误

srs进程fork后,未能输出重定向而返回错误,导致fork的子进程未能出。

* remove the var child_err

* Fixed IO redirection error detection

* Fixed BUG where lost during logs on normal start
4 years ago
winlin 85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 4 years ago
winlin 0123125ec2 RTC: Fix rtc to rtmp sync timestamp using sender report. #2470 4 years ago
john ea8cff6163
RTC: Fix rtc to rtmp sync timestamp using sender report. (#2470)
* fix annotation spell failed

* RTC to RTMP using SenderReport to sync av timestamp

* update pion/webrtc versio from v3.0.4 -> v3.0.13, auto config sender/receiver report

* Add rtc push flv play regression test

* Add unit test of ntp and av sync time

* Take flag CXX to makefile of utest

* Add annotation about rtc unit test

* Fix compiler error in C++98

* Add FFmpeg log callback funciton.
4 years ago
winlin 5e876277b6 Update README, move docs to trunk. 4 years ago
winlin 3d58e98d1c Squash: Support github actions for CI 4 years ago
winlin 5fc455ba3b RTC: Remove TestRtcBasic_Republish for random fail 4 years ago
winlin 140d180d08 Actions: Support push and pullrequest 4 years ago
winlin d08f8fab8c Refine Dockerfile 4 years ago
winlin a2df2a2402 Refine Dockerfile 4 years ago
winlin 2fdb06299c Support utest and regression-test when release. v4.0.156 4 years ago
winlin 640436d8a6 Refine expose ports for SRS 4.0 4 years ago
winlin 785d1744fc Expose live streaming ports for SRS 3.0 4 years ago
winlin cadefc34ae Support release SRS 4.0 4 years ago
winlin becfb517bd Support Github Actions 4 years ago
winlin 32c79b49cc Support Github Actions to publish SRS. 4.0.155 4 years ago
winlin e22035b749 Squash: Fix RTC session info bug 4 years ago
Johnny 7c1d3edd36 RTC: fix SrsSessionInfo about copy assignment operator and comparison operator. 4 years ago
winlin 36cbe851ca RTC: Fix reousrce find bug 4 years ago
winlin 7c899a0afd Squash: Update version query. 4 years ago
winlin 34b97bf68d Release v4.0-d3, v4.0.153 4 years ago
winlin 24431d35ac Squash: Merge SRS4 4 years ago
Haibo Chen ab988abc59 For #2516, fix codec issue for G.711 or H.263. 4.0.152 4 years ago
Haibo Chen aad90c7f42
fix coredump bug: caused by publish stream that codec is unsupport, sush as G.711, H.263 (#2526) 4 years ago
matthew1838 452ca7e88f
add server_id into http_hooks (#2521)
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
4 years ago
winlin 29dea37dbb Squash: Merge SRS4 4 years ago
Haibo Chen dffc344747 RTC: For #1657, support http hooks n_play/stop/publish/unpublish (#2509)
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
4 years ago
Haibo Chen 345b691895
support http hooks for rtc: on_play/stop/publish/unpublish (#2509)
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
4 years ago
winlin 9bf5005bdd Squash: Merge SRS4 4 years ago
winlin 57f6eb09c1 Use 4.0 docker srs:4 4 years ago
winlin 42872e2500 Release v4.0.150 dev2 4 years ago
Haibo Chen c048731049 Get original ip instead of proxy ip, for rtc api (#2514) v4.0.150 4 years ago
Haibo Chen 84d04adfff
get original ip instead of proxy ip, for rtc api (#2514) 4 years ago
winlin 92cbb1f072 Refine code 4 years ago
winlin adf0043cbc Fix #2508, Support features query by API. 5.0.10 4 years ago
winlin ee376da0c6 Fix #2508, Support features query by API. 4.0.149 4 years ago
winlin 69faf06f0f API: For #2508, query feature docker and packager. 4 years ago
winlin 86e506e6ec API: For #2508, query feature docker and packager. v4.0.148 4 years ago
winlin 983d521987 API: Use libuuid to generate uuid. v5.0.9 4 years ago
winlin 48ef3dcd83 API: Use libuuid to generate uuid. v4.0.147 4 years ago
Haibo Chen 529b89a29e Fix #2504 coredump bug: caused by publish stream that codec is h.263 (#2505) 4 years ago
Haibo Chen 06f10b1894
fix 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
Haibo Chen f62a4c4893
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 ed6f8689b4 Release 4.0 dev1, v4.0.146 4 years ago
winlin 301a8ceadb Squash: Merge SRS 4.0 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
Haibo Chen fb73d42c38
explicitly enable nack, for firefox (#2373) 4 years ago
Winlin fe5a14568b
For #2483, add regression test for RTC stat API (#2486) 4 years ago
winlin 1c80b529f8 Squash: Merge SRS 4.0 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
Haibo Chen 0efd7b1bbc
RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483)
* 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
winlin 33610c6865 Squash: Merge SRS 4.0 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
Alex.CR 4b7ba0e1e9 SRT: Use thread-safe log for multiple-threading SRT module. (#2474)
* 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 4ca433d3f8 Refine push script 4 years ago
winlin 6c40419de7 Fix configure bug 4 years ago
winlin beea3216fe Squash: Refine IDE 4 years ago
winlin 169f08bae1 [IDE] We should always configure SRS for switching between branches. 4 years ago
winlin 97c627f9d4 Squash: Support CLion 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
winlin 12ba584ea3 Fix build failed 4 years ago
winlin 8f91a90f28 Squash: Fix padding packets for RTMP2RTC 4 years ago
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
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
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
4 years ago
Winlin 77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 4 years ago
winlin 5a7a742f36 Squash: Update README 4 years ago
winlin 67ebd08342 Add role(srs) to query versions 4 years ago
winlin 13d015b8fd Squash: Fix random bug 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 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 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 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 98e56f5325 Refine the random id by srs_random_str 4 years ago
winlin 0391e71682 Squash: Merge SRS4 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 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
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
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 ce47d5cc28 Squash: Update README 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
Alex.CR 67ac720b92
srt publish core dump bug (#2429)
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
4 years ago
winlin a594678e3d Squash #1685, #1282, #1547: Support ARM platform. 5.0.5 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 efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 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 f75ef2f808 Build: Support --shared-ffmpeg 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 785d2fce08 Build: Support --shared-srt 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 7e657ae654 Refine AUTHORS format 4 years ago
winlin 689100f651 Refine AUTHORS format 4 years ago
winlin 9e2c6d458e Fix build fail for SPDX 4 years ago