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

1997 Commits (0ff49fd299f3acad12a907410500c02fbb46cbf5)

Author SHA1 Message Date
winlin b38bae2a89 for , refine parse pes packet, remove the clear method.
winlin 1685cdd48e for , parse pes packet ok, ts message ok.
winlin 486277089d for , parse the PES ts packet payload.
winlin 755e61e011 update the qt project.
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108
winlin cc87992fe0 for , decode the PMT and PAT
winlin 7692e50fc2 for , calc and verify the crc32 of PAT.
winlin 52b62918d9 for , decode the PAT of PSI ts packet.
winlin 51aecb8fde for , decode the ts packet header and adaptation field.
winlin bd395904df for , the ts packet and adaptation field.
winlin aff7a1cb4d add ts packet definition for .
winlin 919a85b103 for , hls support h.264+mp3, ok for vlc. 2.0.107
winlin 2c42350489 for , http ts stream support h.264+mp3. 2.0.106
winlin aaade0f04f for , refine the pcr start at 0, dts/pts plus delay. 2.0.105
winlin 9cbc753e8e for , , refine the pcr start at 0, dts/pts plus delay. 1.0.25
winlin c9d270fbe0 refine code for , ts remux
winlin b0daf1482d update version to 1.0.24
winlin 1835957a2b for , refine pcr=dts-800ms and use dts/pts directly. 1.0.24
winlin ea85ad2e20 for , , move the ts codec to kernel ts.
winlin d22e4e86d8 update projects for rtmp renamed to protocol
winlin 711b6ca277 for , basic stream caster framework. 2.0.104
winlin 6463d22a14 for , add mpegts over udp stream caster class.
winlin 7f02bfa3a4 for , the mpegts over udp stream caster framework.
winlin 52891b491a listen and serve stream caster mpegts over udp.
winlin f9d1e1111a merge from feilong, consumer directly sleep when paused.
winlin 8ace73f30d for , use absolutely overflow to make jwplayer happy. 2.0.103
winlin 4f5cc9c403 for , use absolutely overflow to make jwplayer happy. 1.0.23
winlin 6b89ffbc1d add config section for stream caster.
winlin 73cfdea332 for , srs http server support dash vod stream over mp4 range. 2.0.103
winlin e0ee8de2fb for , srs http server support dash, flash request range in range or bytes.
winlin a4ba40952a for , rename rtmp to protocol dir.
winlin d9a012164e update vs2010 project.
winlin a647043a06 update readme and wiki url for http ts stream
winlin 2a05783d5c for , support http ts stream. 2.0.101
winlin dfe385d0c9 for , move the simple buffer to kernel.
winlin 77d78eac5c for , add http ts stream framework.
winlin 0f59073400 refine code, rename the pts to dts although both ok for audio.
winlin 913f98b902 for bug , http ts stream, move the avc codec from app to kernel.
winlin dc6299171f refine http stream code.
winlin 7d86c6d9e9 for bug , refine for fast cache of http stream.
winlin 2167a8385c update version to 3.0.101
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
winlin 7305fa6f03 update vs2010 filter
winlin f26a2a8f0e add vs2010 filters.
winlin db700a0c64 update vs solution
winlin 31efea4f33 rename srs cmake ide to jetbrains clion
winlin 664c85cf3d Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin a3607c9193 use ide dir for ides.
winlin 49330b98b3 Merge pull request from panda1986/develop 
支持mp3音频编码
panda1986 797c1b0762 support all acodec. not forced to aac.
panda1986 e7d54c2ca9 Update srs_app_ffmpeg.cpp 
srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
winlin bb1331cc91 update conf.
winlin b735e29d05 refine conf, add port.
winlin e5ef4c2e66 update the conf of http static and stream.
winlin 5f194bc87c merge from feilong, the crash for cosumer wait.
winlin b7b268dfbf fix , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
winlin 29a8932b49 for bug , use http stream cache for android weixin to happy.
winlin f9f2fcbb9c for , add http stream cache for audio mp3/aac stream.
winlin e6549b261c for , support http mp3 streaming
winlin d364a81d8f for , support http mp3 streaming
winlin 99bf397487 for bug , add mp3 id3 spec
winlin b04888a35d for , , support http chunked encoding
winlin 15d87537a1 for bug , support aac stream.
winlin 3244c083c7 for bug , support http aac stream
winlin 7674524c31 for , empty the aac encoder
winlin c0233542bf for , add aac encoder for http aac stream.
winlin 77e43d1813 refine comments of aac publish for
winlin c0a7752718 for , add aac mime audio/x-aac
winlin d546827b1c for , refine the mime of content type.
winlin 3b853a6dbd fix , support rtmp remux to http flv live stream.
winlin 53d9faf395 for , update readme.
winlin eea31ef4f3 for , support rtmp remux to http flv live stream.
winlin faaa9187f2 for , mount http flv stream when publish.
winlin 2698e6dbae for bug , http live streaming framework.
winlin eff2d81016 for , add http flv stream
winlin c4302b9b61 for bug , the http server subscribe the reload.
winlin f1393ee43f for bug , use http not found when no file.
winlin 398b212bfa for bug , refine code, support default http vhost.
winlin 2742c0d3c2 for , support http vhost mount.
winlin 4513486266 refine http server, support mount dir for vhost.
winlin bfff8413b6 refine code for , the copy first param is the dest.
winlin c695a8fcbd refine code for , extract the flv vod stream.
winlin e71bc0cbc5 for bug , refine the http server.
winlin bbe96a4b31 for bug , support flv stream.
winlin cbed2bbca4 fix , refine http server refer to go http-framework. 2.0.98
winlin 9bbbaad288 for bug , refine http api refer to go http-framework. 2.0.97
winlin a1f887f46f refine code, move onMetaData to consts.
winlin 04aa6f8296 drop script data except the onMetaData packet.
winlin cc22ca4890 hotfix , use iformat only for rtmp input. 2.0.95
winlin 4449a8d7b0 fix , use iformat only for rtmp input. 1.0.22
winlin 29be14dd37 merge from feilong, fix memory leak.
winlin a4b61081cc merge from feilong, fix memory leak.
winlin fae006ca7c merge from feilong, fix memory leak.
winlin 63309a0538 refine for bug , drop info frame without error.
winlin b705ed0b90 for bug , refine the codec decode info frame failed. 1.0.21
winlin 964668dc73 merge from feilong, print format error.
winlin b3225100e7 Merge pull request from tufang14/develop 
add client num in statistic with traverse every client for
qiang.li 310e49e7f3 add client num in statistic with traverse every client
winlin 982e9555bd merge from feilong, fix hls msg memory leak bug.
winlin b466756931 merge from feilong for bug .
winlin 27e0521ace fix , fix hls bug ignore type-9 send aud. 1.0.20
winlin 6c833902f9 merge http api from tufang. 2.0.92
winlin ac584a4db2 Merge pull request from tufang14/develop 
add client num for stream in statistic for
qiang.li 46d716612c add client num for stream in statistic
winlin 44f5efda21 refine the print info.
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91
winlin 5aa31568ba fix the rtmp dump, parse the aggregate msg.
winlin 5661fc2676 refine dvr and rtmp dump, write the original data.
winlin a402ca7120 refine code, the consumer always alive longer than queue recv thread.
winlin 89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp
winlin 0e03d019a8 for bug , srs rtmp dump support conn args. 2.0.90
qiang.li 08e9f6ef42 add play client num in statistic
winlin f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream.
winlin ae63af6a4a refine code, implements the stat.:
winlin 97bea51499 refine the api, response the error code and data.
winlin cc796a433a refine the statistic arch.
winlin 40ed2249e8 refine code to use the one coding style.
winlin 4bb17f0c81 replace the TAB with 4spaces
winlin 344ff24f66 add srs_app_statistic to upp project.
winlin 67adc8dc61 merge with security bug fix.
qiang.li a4a93613d0 add statistic for stream
winlin dc11418c79 fix : http-callback support on_dvr when reap a dvr file. 2.0.89
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19
winlin 7f60d472e6 remove the change vhost forward.
winlin 45724bfaec update conf for transcode.
winlin 0b9bbdbe74 Merge branch '1.0release' into develop
winlin f9a33fbeee fix the compile failed for utest at 32bits cpus
qiang.li 8d534d3470 get stream info use http api
winlin f881bc43b5 fix : dvr support custom filepath by variables. 2.0.87
winlin f89941254a refine code of security deny check
winlin 18b15b9099 refine comments of security deny check
winlin 75f2607685 fix , support security allow/deny publish/play all/ip. 2.0.86
winlin f8ec7c706d merge from 1.0.18, hotfix , trim the last 0 of log. 2.0.85
winlin e590537dca fix , trim the last 0 of log. 1.0.18
winlin 07b207b7e3 remove test code for api-server.
winlin 9d34820c80 fix : http-callback check http status code ok(200). 2.0.84
winlin 8df0f724d6 fix , http-callback post in application/json content-type. 2.0.83
winlin ca977ef739 hotfix , http-callback post in application/json content-type. 1.0.17
winlin 518a5a72ab fix , srs-librtmp flv read tag should init size. 2.0.82
winlin c1c01ec802 hotfix , memory leak for http client post. 2.0.81
winlin bb6dfe40c1 fix , memory leak for http client post. 1.0.16
winlin 569596c10d update copyright, from 2013 to 2015
winlin 1824e18bd2 fix the comment bug.
winlin 12f4abd553 fix , aac profile is object id plus one. 2.0.80
winlin c0a6c3efa3 merge from 1.0release, hotfix , the forward dest ep should use server. 2.0.79
winlin d9aca8ab82 hotfix , the forward dest ep should use server. 1.0.15
winlin e27c95b0e8 merge from 1.0release for , the hls pcr is negative when startup. 2.0.78
winlin 513c1ec6d5 fix , the hls pcr is negative when startup. 1.0.14
winlin 5e9ff71740 refine the log verbose