github.com/ossrs/srs commits | Ecosyste.ms: OpenCollective

Merge branch 'feature/rtc' into develop

caf7e9e6eac990def7fd3be0b65b6cffff458b64 authored almost 5 years ago

Merge branch 'feature/codec' into feature/rtc

c00ffa530bf57a48f2f30f8dcc4c3fd4f55b25e3 authored almost 5 years ago

Merge branch 'feature/ffmpeg' into feature/codec

a912f0475f40b5822ed31a6be5ad6ba1be96e467 authored almost 5 years ago

For #1659, #307, add switch to disable rtc

602a478e1bb55f6b1d9421afb62b7aa4e112fef1 authored almost 5 years ago

For #1659, #307, add x86 asm for ffmpeg for rtc

37c84eccc02181c3466b52ad634b5f1a3a16ae0a authored almost 5 years ago

Update RtcSession peer address when changed.

734e8487410e2e22e2a88bbb912f341aba4ac5c8 authored almost 5 years ago

For #1659, #307, add ffmpeg-4.2-fit for rtc

4308f238c069ba856678b5843294368615215823 authored almost 5 years ago

For #1659, #307, add opus codec library

634a14bfa6c41d074d616f288bff251e424b739f authored almost 5 years ago

For #1638, #307, config to discard aac for rtc

2da4e0a43ed012180b01978eb1392671375e766c authored almost 5 years ago

For #1638, #307, add comments for audio codec

e1fe2d1c1daf6becb62f574c12c96cd2911f7518 authored almost 5 years ago

Exception handle

f09dda85fca62044def304a3abad09c3d2667f88 authored almost 5 years ago

Merge from bepartofyou

2757ec79734a6562feccf3ea30ee91d5561c53bb authored almost 5 years ago

For #1638, #307, add comments for vhost rtc config

0cd67a997ec5812050758fd01d3eee90fbc69f9d authored almost 5 years ago

Merge branch '3.0release' into 4.0release

be746da21c1e6740b53569367f20a0db17edd8b8 authored almost 5 years ago

Fix #1629, fix kickoff FLV client bug. 3.0.137

0dd6c31487c2d4adc163d0b136d3c5976c7e2a7d authored almost 5 years ago

make webrtc audio work

a0a4337214331f174abc5274e4e31e4cf3b72a6a authored almost 5 years ago

Fix config read "bframe" discad bug.

7315b1a26d4405854af78cc728f178c8cdde193c authored almost 5 years ago

1. Modify rtc.conf to support Bframe discard.

2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp

fa700dad64f2791366864e0daf43f6cbf3210892 authored almost 5 years ago

Fix #1619, configure without utest by default. 3.0.136

850a4bbf205c4b603a2c6331e1eb65c4a354f0af authored almost 5 years ago

For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135

f89b4b3b26bec6b25bd56d7505d7fb831b173b9e authored almost 5 years ago

Merge pull request #1651 from lam2003/3.0release

修复srs_write_large_iovs中nwrite未累加的错误

355f3514356e6b6ed9c8c71a745a0bd2b402b6f5 authored almost 5 years ago

Update authors

b6b52363fbbffdcee926327cc2302a0095562191 authored almost 5 years ago

Merge pull request #1654 from cainiaoDJ/update_cmakelists_for_clion

更新CMakeLists.txt文件，使项目能在clion编译通过

97035d230125042e14abef3fbf273a36bb8a9fa5 authored almost 5 years ago

Merge branch '3.0release' into 4.0release

955de3dac90a2d37ac36f90d16b0e2448164ac6e authored almost 5 years ago

Remove empty line.

68ad006b731edadc9d219421fa1ae4f2b3c9c521 authored almost 5 years ago

For #1638, #307, show error information when api failed.

3f6a2871b05626ea7e41a92ae3a59157de6d740b authored almost 5 years ago

Refactor api, follow https://github.com/rtcdn/rtcdn-draft

d2036455ac294f1bed7321172c75ef27eff9664d authored almost 5 years ago

Refactor api, follow https://github.com/rtcdn/rtcdn-draft

61b8ae8c3001f9d82a57643cdae586a69c51703f authored almost 5 years ago

Refactor api, follow https://github.com/rtcdn/rtcdn-draft

3360db7b779afe5ef4005f24582c95c4de1a4b14 authored almost 5 years ago

Refactor api data, url to api

532750f18a949280dff8718ebf74a089c1af0bfd authored almost 5 years ago

Update mirror

75f62dc653465c4f474fe77619b6a9c59de75adb authored almost 5 years ago

Update mirror

5a55cff7ba440eb238a8a2999f813c1c1e5dc599 authored almost 5 years ago

Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2

de9a004ff7e0c1376fb04303499fe2251d1b02aa authored almost 5 years ago

更新CMakeLists.txt文件，使项目能在clion编译通过

2911c814c413cf16c1413970aedcbeb85879cebd authored almost 5 years ago

Update

881506883e631a8e865cced15360f7bdf0e570fd authored almost 5 years ago

fix push.gb28181.conf, gb28181conn repeat call serve()

8b4f84e3364fb4ac8a646e4d287f82b78d8c5cd1 authored almost 5 years ago

Support gb28181 sip over udp, ps steam over rtp

cbe9c1dabcb9c35e27b7bd4f34ad056c6a908c4e authored almost 5 years ago

Update

737e4bc32da79be5b256d52261d3fdc5e1a1cfe9 authored almost 5 years ago

Release multiple processes for SRS by reuseport

83f743645b69cb3bb33fb80b0929e37b187fed0a authored almost 5 years ago

修复srs_write_large_iovs中nwrite未累加的错误

bbfb03f98a3bdb32d5e062e74b86d573f5f0a126 authored almost 5 years ago

Merge pull request #2 from ossrs/3.0release

update to latest

f9114770afa4dc595bc7337e7f7db7416155b453 authored almost 5 years ago

For #1638, #307, use hourglass for timer.

8eef439c90a79d69abc5955cdf9831e72abdb306 authored almost 5 years ago

For #1638, #307, update authors for rtc

830e60da29a7fc5689ab3ab5a7619a24c6ec4c6c authored almost 5 years ago

merge feature/rtc, fix conflict

94e4f4539d99de03dc9f47fe0f0f7197f3f51ea8 authored almost 5 years ago

Detect B frame in avc stream. Fix compiler error with verbose

d1d16d490ef3db3c1082e3c9b50fa7144a5989c7 authored almost 5 years ago

For #1638, #307, remove unused code for rtc

0b6e9257f94e5a82845f6182388a4c39ff31c8c4 authored almost 5 years ago

For #1638, #307, fix error new bug for rtc

018577e685a07d9de7a47354e7a9c5f77f5f4202 authored almost 5 years ago

For #1638, #307, refactor rtc player.

979d7c3f4fe8b59b56667f9b161c75f72733e7a4 authored almost 5 years ago

Release 3.0.134, 3.0-b3

aead1a5b74f75fc4f9d1db0b7041f6582c43397e authored almost 5 years ago

For #1638, #307, refactor rtc player.

c210c0b2f5e2de19d9b295c86f6f05dd20d78129 authored almost 5 years ago

fix h264 rtp packet error

e2233027b83c16818363e21401acb4049853a0ee authored almost 5 years ago

Refactor source cid with pid

fc84f1e5456b759af14a5af4c31f7da186055034 authored almost 5 years ago

For #1638, #307, should set err in return value.

28c1c57854571fa53a75617dd3e29485865ec16e authored almost 5 years ago

For #1638, #307, should check error by fetch_or_create source

0ff8a3761bef8f2a7d13b6967f85f2cb87cbbc7a authored almost 5 years ago

For #1638, #307, refine api and udp for rtc.

ed2996141c42fc8fa1d70952fd59e6ea37391b30 authored almost 5 years ago

For #1638, #307, extract rtc server to hybrid manager.

2c4dc0fb3d73da359c1afc33cef5666813037c93 authored almost 5 years ago

For #1638, #307, switch to RTC session context cid for cleanup

4318d989a636990eed89dd845781f94788f36b01 authored almost 5 years ago

For #1638, #307, switch to RTC session context cid for reusing UDP ports

25fec76ea9b154c9e7269531641c32ec611f497a authored almost 5 years ago

For #1638, #307, use short-term http connection for rtc to use new cid.

29b9203428c33898237539acfc2ac3d90c6bd8b0 authored almost 5 years ago

For #1638, #307, http api success with message, timeout as such

6118ca382a68b3e292939611a9a308002608873e authored almost 5 years ago

For #1638, #307, fix build warnings

b5dd5021036fdf3597c5c7d2df3f17102bf39267 authored almost 5 years ago

process err, do error check, add some error code

e8b2bb5d2864374f0fe068296042f62433736ead authored almost 5 years ago

For #1638, #307, add comments for api and enum

c2a667cc35c11d43a7b27e70d4a5cdc027202ff4 authored almost 5 years ago

For #1638, #307, accept srs_string_dumps_hex to app utility.

2f0b150588ddd6334d36353538c701c8d7cc1413 authored almost 5 years ago

For #1638, #307, add comments in RTMP/RTP message for RTC.

e905fce847d2c617c22925cbfed5794af2809d05 authored almost 5 years ago

3.0release is beta now

9ba861f42fcd95d3db15bd3bcc6263566cbefb29 authored almost 5 years ago

For #1635, refine inotify watch for relative path

a8ddd5afe7e87dddf5119e18df38b64ba00e51e6 authored almost 5 years ago

For #1635, refine inotify watch for relative path

8db2c3d8211751f166b21731e05b0d97456879a8 authored almost 5 years ago

For #1638, #307, remove unused bash variable.

9e856c84e7aef5dd9c0117c04ee361acf193a04c authored almost 5 years ago

For #1638, #307, fix rtc player demo bug

4b23d0463576c7d2afafe84e3e63107b5d06376f authored almost 5 years ago

For #1638, #307, merge john, add NACK suport, remove debug code, verbose log

60c8b37f05ab233aabb54e67ad64c161617b1699 authored almost 5 years ago

For #1638, #307, define webrtc:// url for play

c2916acd92546c7b248186bf6991212a609ecc45 authored almost 5 years ago

add NACK suport, remove debug code, verbose log

2b56f9ee5910a0d9f78f616643a5df389540da26 authored almost 5 years ago

For #1638, #307, use webrtc adapter.js for demo.

12e99f1897bf2db5f790deeae3c8f6ddfbb97607 authored almost 5 years ago

For #1638, #307, refactor rtc config.

a42cf3ae8db71414f754456fa62f20ccb26489d6 authored almost 5 years ago

Merge SRS4

6f4584db53088a352c06e4110415e9dfaeb9c234 authored almost 5 years ago

For #1638, #307, rtc conf support ENV.

51af2b477992aeb0587cb49629492b5b8b3690fd authored almost 5 years ago

Merge SRS3

a135eb2144b8a04c8e4af27f3cd216f6c91ad79e authored almost 5 years ago

Remove KAFKA config, because it's removed from code

88336b1f5edc0a1a890a1aa27b4b83bcc1b548cc authored almost 5 years ago

Update README

70307ed8f9c54d444e90a7db17f7ead6bd2894d3 authored almost 5 years ago

Update README

446e5f9a0cac220723ea41c4b5635ba0175aa1ae authored almost 5 years ago

Update README

fc3704e54e8805f2fef237cee7652751e0eb12c5 authored almost 5 years ago

remove debug code, fix rtc.html

6c88f5807933aab9d85d143ba1edcecfc6a57826 authored almost 5 years ago

Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc

d21ef106a0dfbe721da6a99021b45a8654163972 authored almost 5 years ago

add kernel rtp packet

768598a3bb2a0429a689008ca374d45ab2b16be7 authored almost 5 years ago

add rtp shared packet

027d34bbd304ce79b48603fa80b2f392d8668306 authored almost 5 years ago

For #1636, muxing sh, use sound_rate if aac sr not set.

a7c8980a607e893c3e2cccaaaed280e2a8cd2771 authored almost 5 years ago

For #1636, add comments

7036f839d275b5a54197888f30fc63bef1f71a08 authored almost 5 years ago

For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13

aa20a04abb7556c1454832aeac4806fb0f9772b3 authored almost 5 years ago

Merge pull request #1636 from runner365/3.0release.srt.dev

support all aac sample rate in srt2rtmp

c66f33ac87f0fd34d729c878a157813b6f7aa0fe authored almost 5 years ago

Update install

08bffc60fb526bcf2098e05acbcb0df9cf24ad94 authored almost 5 years ago

adjust code style, fix some bug, add rtc session timeout

6decdc7838e9f9a941e93611c206c55759fd3277 authored almost 5 years ago

Merge SRS3

1382337cb4e456d06762d18d9e0db4311bf88e89 authored almost 5 years ago

For #1635, inotify watch ConfigMap for reload. 3.0.134

856ed5a971229f51549736e49bfe26567d23628c authored almost 5 years ago

For #1635, inotify watch ConfigMap for reload. 3.0.133

bb509d23e246a8f962ecdf164da919b12023040a authored almost 5 years ago

For #1635, inotify watch ConfigMap for reload. 3.0.132

88368ed18d9dc4a6ba4d57964f8f3b99a3724e04 authored almost 5 years ago

For #1635, inotify watch ConfigMap for reload. 3.0.131

940798a9c7004674c2ba399c56c4d43175a2192d authored almost 5 years ago

Merge branch 'develop' into 3.0release.srt.dev

f102a598b800043a53aaa0a04ad266fec203e7f3 authored almost 5 years ago

support all sample rate in aac

b9195122cf6ee70fb4a155d46d96d0cd1f97abe5 authored almost 5 years ago

For #1635, inotify watch ConfigMap for reload. 3.0.130

5e60c8f9cc4641d37c4e894af17a7faa0db72daa authored almost 5 years ago