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

2519 Commits (c34b0c86e1b48d6f3e477bffe1a3117d046f609b)

Author SHA1 Message Date
winlin ad32048c1c fix the http flv stream caster.
winlin cba6675560 refine the http message, set the connection if required.
winlin ba6c3132e3 refine code, use decoder to parse flv stream
winlin 411f5a1d2a Merge branch '2.0release' into develop
winlin ea1e015a4e fix the http read chunked encoding bug.
winlin da00b67c76 Merge branch '2.0release' into develop
winlin a95fd6d140 read the http flv stream.
winlin 022b6aa561 refine the http remux for http flv stream.
winlin f0c24eeacc add stream caster for post flv over http.
winlin 91e285b0cd Merge branch '2.0release' into develop
winlin 4b372d8d16 change primary to the primary branch.
winlin 94681702e1 Merge branch '2.0release' into develop
winlin e63b8eda51 migarate to srs org.
winlin 42ddb76544 Merge branch '2.0release' into develop
winlin 8603dba697 migarate to srs org.
winlin 17b15deee6 Merge branch '2.0release' into develop
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org.
winlin 53e92a17f5 Merge branch '2.0release' into develop
winlin 115daa3cc1 migarate from winlinvip to srs org
winlin 5559fb9842 Merge branch '2.0release' into develop
winlin b3bd007f0d update git commit
winlin ae6d0a5ab1 Merge branch '2.0release' into develop
tufang14 b6d650cdb4 m3u8 mount bug
winlin dbcd7d883b add script check_hls_backup.sh to research hls.
winlin e50996270e fix the config parse error.
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url.
winlin 7b157b0678 refine hls ingester, quit when error.
winlin aabe84046c refine hls ingester, quit when error.
winlin 114f4447bb Merge branch '2.0release' into develop
winlin 4e5ddb51e7 refine the overflow algorithm, prevent smaller piece.
winlin 1d973e2178 refine the overflow algorithm, prevent smaller piece.
winlin d19dfa528e abs overflow also plus the deviation, for pure audio hls.
winlin c514a4ceeb use atc for ingest hls aac time.
winlin 3e0ba172a3 Merge branch '2.0release' into develop
winlin a28eec89b0 support ingest hls with m3u8 in m3u8.
winlin 7d5f1c2be8 Merge branch '2.0release' into develop
winlin ba6736839b support hls ingest, fix the bugs.
winlin 2239e9f1fd support ingest hls live stream to RTMP.
winlin 23b978c0bb merge from github
winlin 623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release
winlin 6e5c587e0a support aac_adtstoasc filter to copy mode.
J aca02b6d6b for #384,refine code for empty body request.
J 8adbdc39e3 for #384,refine code for empty body request.
J a71db53661 for #384,refine code for empty body request.
J 56f75cbbe9 fix
winlin 6726a88f47 merge from 2.0release
winlin 22ca46350b fix , support mix_correct algorithm. 2.0.161.
winlin 8fbc6526bb for , refine code to support mix correct algorithm.
winlin 542aab4557 fix the hls notify bug, pass the query to get path.
winlin 70c1d3cc7e Merge branch '2.0release' into develop
winlin 02a2cb7e1a for , refine the hls notify, report one by one.
winlin a4216cc582 add todo for ts parse.
winlin 40eab7fc88 for , refine the deviation for hls.
winlin 0c939e7114 merge from 2.0.160:
winlin dcac9c69d5 fix , support reap hls/ts by gop or not. 2.0.160.
winlin 9759b78da8 Merge branch '2.0release' into develop
winlin 0000c945ea refine the proxy api server.
winlin fe1886aa08 add proxy for hls
winlin e5b8e0da01 fix async call and hls_nb_notify bug.
winlin 5d37e47783 support config the hls_nb_notify.
winlin 0a7cea063c refine http read, support c style api
winlin 5c00ce8a96 refine hls on_hls_notify, read a little of ts.
winlin 1f93fb3399 refine hls notify, support timeout.
winlin d8988da0ea refine the hls_on_notify, calc the spent time in ms.
winlin 310157ab77 refine the hls_on_notify, calc the spent time in ms.
winlin e6d6bdfe57 refine the hls_on_notify, only read a chunk.
winlin 17c1423f4a Merge branch '2.0release' into develop
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts.
winlin 7dbc95e085 refine the hls deviation for floor algorithm.
winlin 425e69e0cd Merge branch '2.0release' into develop
winlin 23b310971e guess again when annexb change to ibmf.
winlin 71e1602458 merge from 2.0.159
winlin bd77f995bf ignore the unknown flv tag.
winlin 546be09219 fix , fix hls bug, keep cc continous between ts files. 2.0.159.
winlin 29ac4c724b change default log tank to file.
winlin cfed8e81c5 merge from 2.0.158
winlin e56d7add44 fix bug of config to parse the default value. 2.0.158
winlin aef97db77a refine the config code.
winlin 931370e9f6 Merge branch '2.0release' into develop
winlin e7fd309cb0 refine hls info, show the deviation in seconds and pieces.
winlin e958305d09 Merge branch '2.0release' into develop
winlin 6e2d756e1b fix the bug of h.264 bit stream demux.
winlin bd7db5aed6 only ignore the aud message.
winlin 61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message.
winlin 4329366c08 for , do not add deviation for absolute overflow.
winlin 4f9df4f1a0 merge from 2.0.157, reap ts on the IDR.
winlin 77c29da26b for , rewrite annexb mux for ts, refer to apple sample. 2.0.157.
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156.
winlin 7e1749e029 refine the comments.
winlin e458305f81 add utc time format.
winlin 90cd16aae4 Merge branch '2.0release' into develop
winlin 56cd373015 support hls callback with duration.
winlin 64b065e450 for hls callback, add duration of ts.
winlin c4466a8c0c fix crash bug for hls cleanup.
winlin eb54ec25c9 fix compile errors.
winlin cb148e43ee merge from 2.0.155
winlin 17c0a5c470 fix , support transform vhost of edge 2.0.155.
winlin d95e5a3f47 Merge branch '2.0release' into develop
winlin 4d98cbb965 add hls config in api.
winlin fe5783e7a4 merge 2.0.154
winlin 8401d9ac06 fix , config hls to disable cleanup of ts. 2.0.154.
winlin 2d3d628865 merge from 2.0.153
winlin 717d088376 support server cycle handler. 2.0.153.
winlin e75b7e89d6 merge from 2.0.152
winlin 3b4bd194b6 refine http hooks, donot pass the known variable.
winlin c49bc0628e support on_hls for http hooks. 2.0.152.
winlin 97442c56b6 enhance hls in floor mode.
winlin 76c1957260 enhance hls, increase piece one by one.
winlin ef28865991 merge from 2.0.151
winlin b9c21b1e8f enhanced hls, warning when ts dup or jmp.
winlin 9be7fbba7d user smaller deviation to avoid dup ts.
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151.
winlin 40f186ba82 Merge branch '2.0release' into develop
winlin cd682ae4be update donations. fix hls path bug.
winlin abbed8f66c merge from 2.0release
winlin 692b751da8 for , support config the m3u8/ts path for hls. 2.0.149.
winlin 922adaf59f Merge branch '2.0release' into develop
winlin 85afb6ea6f add donation. fix bug of adts.
winlin 01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0.
winlin 75ca70c619 Merge branch '2.0release' into develop
tufang14 0faaa61be7 seg fault 
seg fault
winlin a5c5befad1 for parse video ts.
winlin 896983c1dc refine the aac codec enum name
winlin 1401f2e0ab ignore when sps/pps consumed all frame.
winlin 12d5431f3b Merge branch '2.0release' into develop
winlin b319e9ff9c ignore when sps/pps consumed all frame.
winlin c250e3e651 Merg branch '2.0release' into develop
winlin e818f36316 fix , fix build bug for centos7.
winlin 713cedfbb4 fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin b6feb0742f fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin d16ae193f6 Merge branch '2.0release' into develop
winlin fcab17741c fix , the dvr path rule changed.
winlin df3f24403e Merge branch '2.0release' into develop
winlin 02addf61f7 fix , remove the thread unsafe code, no static.
winlin bfa46e7a98 fix , remove the thread unsafe code, no static.
winlin f69fa7273b fix , remove the thread unsafe code, no static.
winlin 09ce6651eb Merge branch '2.0release' into develop
winlin 1cb2992808 refine build for modules, add defines.
winlin 0a7b179e14 Merge branch '2.0release' into develop
winlin 2f2aaf5ee4 for , refine code, donot check network devices for osx.
winlin e7e17cf15d fix osx bug.
winlin 33cca3e027 for , add todo for osx. 2.0.146
winlin e45c62003a Merge branch '2.0release' into develop
winlin bbac2348db for , remove the double underscore functions and variables.
winlin 7065db192c for , remove the double underscore of macro.
winlin 45d9018051 Merge branch '2.0release' into develop
winlin c6817cc422 for , remove the double underscore of macro.
winlin 3ca906d560 Merge branch '2.0release' into develop
winlin 014993ad1e remove the sudo of log.
winlin a4709a6439 for , add comments for the audio overflow ratio.
winlin b1142d83fc Merge branch '2.0release' into develop
winlin 0319e85f99 support config the audio overflow ratio.
winlin b7138ba9c5 merge from 2.0
tufang14 e319da3329 小瑕疵 
小瑕疵
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145
winlin 4a50bf1894 Merge branch '2.0release' into develop
winlin fbd722bf76 refine the fast buffer to more readable.
winlin d25eb0aaa2 merge from 2.0
winlin f36e4a443d refine the fast buffer. 2.0.144
winlin 6a98758435 revert the changes for SRS2.
winlin df2644c850 merge from 2.0release
winlin 6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop
winlin 9bf6c9e9c6 Merge branch '2.0release' into develop
winlin cf3becbc17 for , osx(darwin) enable http api and stat, rusage is ok.
winlin 9f81a8b73e for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin ab673e1300 for , osx(darwin) support demo with nginx and ffmpeg. 2.0.143.
winlin a28c051c2c osx support build nginx and ffmpeg
winlin f3e5431d0f check what a fuck os for some fresh.
tufang14 1cc3384a19 seg fault 
seg fault
winlin 79fbeeb8c6 Merge branch '2.0release' into develop
winlin 8a4312f4ec fix bug, use size_t for string::npos
winlin 9e407d32fe change verstion to 3.0.0
winlin 2241ba0e34 for , , add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
winlin 9c43c73d86 Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop
winlin 33e579599c refine build for osx
wenjie.zhao 65f404fb42 for , refine ts prefix code.
wenjie.zhao 5969f72354 for , refine ts prefix code.
wenjie.zhao 10da182853 add hls prefix of uri supported
wenjie.zhao efe3050d7a fix hls muxer Segmentation fault.
wenjie.zhao 73f13dfc42 fix hls muxer Segmentation fault.
winlin 9a0a8affc5 Merge pull request from tufang14/develop 
可能数组越界
winlin 685a29af83 Merge branch '2.0release' into develop
winlin c92d40e00b for , refine code, use kbps instead skt of rtmp connection.
Nimrod A. Abing (on kohima) a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
Nimrod A. Abing (on kohima) bc93147426 for , disable st examples. for , refine the st init and event select.
tufang14 6cf5a6a7a9 可能数组越界 
可能数组越界
winlin 67671e43f9 Merge branch '2.0release' into develop
winlin 8ee0826e9a fix build failed bug.
winlin 0017ee85e0 Merge branch '2.0release' into develop
winlin 59d9af8039 update conf
winlin a21243ea12 merge from 2.0
winlin d349a3dbda update stable version check
winlin 519c25a064 fork srs2 and start srs3. 3.0.0
winlin 636bc574af start 2.0release, 80773 lines.
winlin e6058c1560 update donation
winlin 320f45c6f4 fix , support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.
winlin 27cb62b7aa for , support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.
winlin 995b130090 for , refine code for hstrs, support hijack handler.
winlin 5c6ef6ded6 fix warning for xcode.
winlin 6d15d0ea99 for , refine code, add hstrs config.
winlin 74fa3ba16f fix build failed for linux.
winlin a15ce1147f for , fix all warnings for mac.
wenjie.zhao 643f18abe4 add hds reload supported.#328
winlin 984145de72 for , add todo for hds, check whether disabled, support reload.
winlin 5d12a1ab20 for , add hds specification.
winlin ffef62900f for , support adobe hds. 2.0.138.
winlin da56e4fbb9 for , fix hds compile error on mac.
wenjie.zhao 07d8f060eb refine annotation
wenjie.zhao 570c0d66bd fix path issue.
wenjie.zhao e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
winlin a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable.
winlin 3e5821efff enable http api for x86_x64
winlin 3732554844 remove the xcode state.
winlin 1ad0c847ce fix http parse bug
winlin f247ac9daf fix the http parse bug.
wenjie.zhao d4198ee8ba add hds supported.
winlin 5370493140 add ingest to mac.dev conf.
winlin 24616e15b5 remove the code for xcode, not required.
winlin b3aed2cb59 fix the bug of configure.
winlin f9767c91b5 fix configure bug, refine code for stream caster.
winlin 6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding.
winlin 5c3c38684b fix the bug of flv stream, metadata type should be 18
winlin 0ff49fd299 for , debug srs on xcode.
winlin db7ddfd510 fix , , support osx(darwin) for mac pro. 2.0.137.
winlin 20fb5f3e8e modify the colorful bash for osx.
winlin b0953c1d3a add comments of audio profile supported by srs.
winlin 5143e3a58d fix , http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136
winlin 2e9f2753c9 for , add stream codec info. 2.0.135
winlin 885b9af122 for , refine code to support he/hev2, use aac object.
winlin 8dbabe3708 fix , refine aac LC, support aac HE/HEv2. 2.0.134.
winlin d3e2838fc6 for , refine the aac profile for adts and aac object for RTMP sequence header.
winlin 04f3f2a8f8 for , add codec info to stream.
winlin 8bf60895a9 refine the kbps of server.
winlin fbbe46d272 refine the config, support directly parse file.
winlin b8e70f8538 support module
winlin ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop
winlin 05d238f860 support modules.
winlin 688890cd7a refine configure, generate objs/makefile first.
winlin a29b8a7a5b refine configure, move auto headers to script.
winlin aaf87cf3d9 add srs module rule.
winlin b360fe279d remove libaacplus.
winlin 496f689de7 fix bug for libfdk aac.
winlin f26e719800 fix , fix http-flv stream bug, support multiple streams. 2.0.133.
winlin 1277968d4a refine http client, use initialize to set host and port.
winlin 2bcb4f811c refine http.
winlin 964e4be9d4 refine http request post. 2.0.132.
winlin 3982ec1d87 refine http request parse. 2.0.132.
winlin 4325809daf refine http
winlin 6fccfa061d refine the http request code.
winlin 025b707330 refine the http request reader.
winlin 3e394a5f06 for , set socket send buffer to smaller macro. 2.0.131
winlin 04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp.
winlin 983ab8fb89 pass all utest for 2.0
winlin e7fd733dc5 fix the long long warning.
winlin 3d47fbdc5c fix build failed of utest.
winlin a47dbf7a92 for , refine code.
winlin 34d6a2ece5 for , support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129
winlin f619f174e6 add readme for ide.
winlin 5d0cb7e68f update conf for rtsp
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
winlin 8ed256b7e9 for , wait keyframe for dvr. 2.0.127
winlin 0213cc6466 for , refine dvr, support POST create dvr when publish not start. 2.0.126
winlin b903a7b436 for , dvr suport vhost/app/stream level control. 2.0.125.
winlin 1cb8e44b1b fix , fix hls bug, write pts/dts error. 2.0.124.
winlin a3648063d5 fix , support dvr http api. 2.0.123.
winlin d650118988 fix , dvr support api to start or stop. 2.0.123
winlin 1246989ea9 for , refine dvr, support callback when reap dvr segment.
winlin 849e59b05d for , support http api to start dvr.
winlin c67a4fdf97 for , enable http api crossdomain for dvr api.
winlin 1445086451 for , update the metadata of flv dvr file.
winlin 7077b74d03 for , add dvr plan append.
winlin 95b4baee7c for , refine dvr code to more simple.
winlin 3d225e1bc7 refine dvr, donot append the flv header.
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122.
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121.
winlin 9d233db27e fix , support push rtsp to srs. 2.0.120.
winlin a954040d29 for , rtsp parse aac from rtp packet.
winlin 0cc693a3b8 for , decode the h264 NALU from rtp.
winlin 6a64164985 for , show more info about rtp.
winlin 45c0b12958 for , finish rtsp sdp, start rtp.
winlin f14af45413 for , alloc and free rtp port.
winlin d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.
winlin ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.
winlin 40fbfd8560 for , rtsp extract tcp/udp listener.
winlin 4807f7850d for , rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.
winlin 604f4cc57b for , support the rtsp options request and response.
winlin c0e50265bd for , create rtsp framework.
winlin e81e090239 for , add rtsp listener and handler.
winlin 78f34ad46f for , support config default acodec/vcodec. 2.0.118.
winlin 922150b2cf for , rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117
winlin 1ed3e283ab implements the pat/pmt write ts header.
winlin e88c1e32ee always increasing target duration, for
winlin 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0
winlin e19ee0cb99 for , set pcr_base to dts. 2.0.114.
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114
winlin 66931a8890 try to fix hls problem, print the video packets.
winlin b8d4f68a69 try to refine hls, always flush video when reap segment.
winlin 5a3cd235fd refine hls, try to fix the hls ts corrupt problem.
winlin d5e3ac4e7d for , the aac profile must be object plus one. 1.0.26
winlin 4820d455d5 for , workaround to force to LC/MAIN, donot support SSR above. 2.0.113
winlin f8bdd28de6 add comments for hls m3u8, target duration may should not changed.
winlin 693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char
winlin 81ea6d34ce add pdf of hls rfc, corrent the content type.
winlin 30b1759aa9 fix bug for memory hls.
winlin bdda337f33 fix aac adts bug, the frame length is 2bits.
winlin 0af6e5e829 fix bug for srs-librtmp
winlin dba983d124 for , update the config for ram hls.
winlin a23191497f fix , support hls without io(in ram). 2.0.112
winlin 89b37d3469 for , refine the conf for hls.
winlin 4d10cc9f59 for , add conf.
winlin 16afe7ddbb fix , support push MPEGTS over UDP to SRS. 2.0.111
winlin 4246be92c9 for , merge avc to codec. use queue to dequeue.
winlin 153a3a6c42 must user pithy print for mpegts print.
winlin 70c8fe13c4 for , support h264 video for push mpegts over udp. 2.0.110
winlin 66fccdbbd1 for , demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.
winlin bce78fdab6 for , add comments for elemetary stream specifed by stream_id.
winlin a384cc400a for , use udp packet handler.
winlin 35ab0ea627 for , use buffer to cache bytes, for system will split the udp packet.
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.