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

3539 Commits (202a584aab6622bb3e0704190f37c3ea0775a718)

Author SHA1 Message Date
winlin a0ba17b397 CI: Cover kernel ts
winlin 073d42ca7d CI: Refine hls ts context writer
winlin 36c41715e7 CI: Cover kernel ts
winlin 8eccfeceb9 CI: Cover kernel ts
winlin 3f59c7885e CI: Cover kernel ts
winlin 4187fa0068 CI: Cover kernel utility
winlin 572ce5ccff CI: Cover kernel mp3
winlin 39541b51a1 CI: Cover all kernel log
winlin 492db1a904 CI: Cover kernel flv
winlin 2fec88b769 CI: Fix kernel file case failed.
winlin ec16e53802 CI: Cover kernel file
winlin 3064b941d5 CI: Cover kernel codec av frame and format
winlin 2bdba63b0b CI: Cover kernel codec
winlin c2a938473a CI: Cover kernel codec
winlin 1df1d84766 CI: Cover kernel LB round robin
winlin 5b311a06b7 CI: Verify kernel aac write ADTS packet
winlin 917cb4a299 CI: Cover all kernel aac
winlin 2ae3440128 CI: Cover all kernel error
winlin 3cd3739433 CI: Cover all kernel error
winlin 8c9857ff6f CI: Remove macros for utest
winlin bfeea72eac CI: Cover all kernel buffer
winlin a2b0767874 Fix build failed.
winlin c646e3f287 CI: Research support codecov
winlin a25efa3764 CI: Update codecov badge
winlin 7243d8e7b8 CI: Support codecov
winlin b4619e3393 Kbps: Remove the union for kbps slice
winlin 98706f793e Support Opus audio-level
winlin f1b1f78c4e Parse Opus for tools
winlin e77b570636 Add codec OPUS/HEVC to FLV
winlin b2d1d84634 Change to 2019
winlin 66198b6f78 Add utest for RTMP protocol
winlin a2d6566019 Add kernel utility utest
winlin 6e44aa4a4f Cover Kbps statistic
winlin 6e9c7dd11e Add utest for SrsKbps as RAW statistics
winlin 6234905532 Refactor ISrsKbpsDelta
winlin dcebf8a31f Refine kbps
winlin aef838338c Add utest for kbps connections
winlin c26b475bae Refine kbps, stub wall clock
winlin 4c40370986 Refine kbps more testable
winlin 16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter
winlin 6e75993e7f Change public virtual to virtual public
winlin 5d959661e7 No sudoer
winlin 2e9bf2af83 Always enable SRS_StreamCaster
winlin 1dc95cba78 Always enable SRS_Ingest
winlin aa1a5442f9 Always enable SRS_Ingest
winlin c6844527fb Always enable SRS_SSL
winlin e4e6dd2169 Always enable SRS_SSL
winlin 0bc7fdbb35 Always enable SRS_SSL
winlin 8e294709b0 Always enable SRS_STAT
winlin 71f1ccbf90 Always enable SRS_HLS
winlin f003ba9a29 Always enable SRS_DVR
winlin 330100769f Always enable SRS_TRANSCODE
winlin 0626bc5982 Use openssl in docker
winlin 432a575c7a Use docker for and
winlin b0e91e8fe9 Use docker for and
winlin f1ab8fecac Fix build warning
winlin ef3e35f173 Fix build warning
winlin 4d157f2148 Fix build warning
winlin dcc2a73e7a Refine kernel aac
winlin 572a2806c1 Refine utest
winlin a8be5f8f27 Allow OSX for utest
winlin f2a93755c2 Allow OSX for utest
winlin f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261
winlin acaae0d5c9 Update SRS3
winlin ba4ef34d27 Merge 2.0release
Steven Liu 78cf3d4b58 upgrade x264 and ffmpeg to newest version () 
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
winlin ff82ca1233 Merge branch 2.0release into 3.0release
winlin 99430d2edb For , Not support macOS 10.14
winlin 24f46f5085 , Support _definst_ for Wowza. 3.0.44
winlin 99aa249f3a , Support _definst_ for Wowza. 2.0.260
MakarovYaroslav e62ac29f48 add ignoring _definst_ at the end of app ()
winlin b2066cbf68 , Fix string trim bug. 2.0.259
MakarovYaroslav a2480a6c94 fix bug with for loop ()
winlin 39f1629168 Merge from SRS2
winlin 58e501ee24 Fix , Support build on OSX10.14 Mojave. 2.0.258
winlin 63ac93a642 Merge from 2.0release
winlin a5b452f965 Merge , Fix sleep bug in us. 2.0.257
RocFang 768fe68ca3 fix st_usleep param from us to ms. () 
fix st_usleep param from us to ms.
winlin 3f009937ee Merge from 2.0release
winlin 9859fa9e6f Merge , Support param for transcoder. 2.0.256
Mirko Velic 70ad16ff6a Add request stream param to encoder output format parameters. ()
winlin 8e55ef4b60 Refine code
winlin 1e2cca4712 For , Refine HLS encryption wiki
winlin 5945fb5a24 Fix , Support HLS encryption. 3.0.42
winlin ee068cf120 For , Support without ssl for HLS key.
winlin 522fba99aa Merge branch 3.0release into harlanc-3.0release
winlin e73e30de3a Fix , Drop ts when republishing stream. 3.0.41
winlin 74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release
winlin 1e054d2bcc Fix , Rename impl__SrsAutoFree to impl_SrsAutoFree
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
Harlan bf12a45274 add configuration instructions for hls encryption
Harlan ac6b37de4b rewrite ff_data_to_hex
winlin a9b5d65ca7 For , Support auth_key param for srs player
winlin 728ddd133b For , Support edge/forward to Aliyun CDN. 3.0.40
winlin 74a87d54f2 For , Support edge/forward to Aliyun CDN. 2.0.255
winlin 1cc72df134 Fix , Support HTTP FLV with HTTP callback. 3.0.39
winlin 1e7c12a6dd For , Support HTTP FLV with HTTP callback. 2.0.254
winlin 928c6ab091 For , Add utest
winlin 01d8bba455 For , Refine code to write utest
winlin 6cea551c64 For , Refine params in http callback. 2.0.253
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38
winlin 03ac48f8fa Merge 2.0, for FLV latency
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252
winlin 580c94c8c0 Refine code
winlin 31945c244d For , Refine code.
winlin 455a060fa5 Merge 2.0
winlin ee43fc92ae For , Refine conf
winlin ae99131512 Fix , Ignore iface without address. 3.0.37
winlin 82699ff616 Refine code for librtmp
winlin 29b74c7220 For , Support params in http callback. 3.0.36
winlin 85d3a5001c For , Support params in http callback. 2.0.251
winlin 68a1656e07 Fix , Always use vhost in stream query, the unify uri. 3.0.35
winlin 09dbda5b18 For , SRS forwarder support douyu.com.
winlin a66d450ec1 For , SRS edge support douyu.com. 3.0.34
winlin 586899a010 For , SRS edge support douyu.com. 2.0.250
winlin 41c6e833b9 Replace hex to string to match MIT license. 3.0.33
winlin 84f81983aa Replace base64 to match MIT license. 3.0.32
winlin 0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31
winlin e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30
winlin dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code
winlin 608c88b8f2 Merge 2.0release
winlin 6d7c7418a8 Merge , fix memory leak. 2.0.249
winlin 551863a7ed Refine code
winlin 693194dffe Merge 2.0release
winlin d27db215df For , should not close fd when success.
winlin e4742ddac7 Merge 2.0release
winlin 2d49b9d1a7 Merge , fix scaned issues. 2.0.248
Hui Zhang (huzhang2) 01ed485cf3 fix 
security scan report issue
Harlan e9cb8210fc fix default value error
Harlan 45a57acbb4 fix bug
Harlan 43ebd5958d fix bug that only one stream can be encrypted..
winlin dba44c7c3f Merge branch 'develop' into 3.0release
xialixin bb4e16ae3c fix create dir success result check ()
xialixin aaf2905a9d add: hls configuration adds [duration] variable ()
Harlan 52596a0b04 add HLS encryption feature
winlin 0d78b908a7 Fix client tools resolve dns failed bug
winlin 449c632e49 For : Add example for origin cluster
winlin bd797ad385 Fix utest build failed for ::atoi
winlin 459272b94c Merge from 2.0release
winlin 0fe17c3e34 Merge , fix crash for edge HLS. 2.0.247
RocFang fd016ed91a use hls->initialize to set req of hls ()
winlin 4bf5ab2044 Fix , support RTMP origin cluster. 3.0.29
winlin c70421e656 Fix , support origin cluster
winlin 2f09ec4353 For , refine result of origin cluster api
winlin 92f2bcd878 For , support config origin cluster
winlin 55c96192e2 For , refine code
winlin ec362b2774 For , query origin info and ip addresses
winlin 469250f850 For , support origin cluster api
winlin d0fbf44d18 For , support config for origin cluster.
winlin db6b8cf914 Fix , switch to simple handshake. 3.0.28