Commit Graph

311 Commits (4f3d2c8607603c05a8e5f8af857a9edd40447cc7)

Author SHA1 Message Date
winlin 115daa3cc1 migarate from winlinvip to srs org
winlin 0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url.
winlin 22ca46350b fix , support mix_correct algorithm. 2.0.161.
winlin 8fbc6526bb for , refine code to support mix correct algorithm.
winlin 02a2cb7e1a for , refine the hls notify, report one by one.
winlin dcac9c69d5 fix , support reap hls/ts by gop or not. 2.0.160.
winlin 5d37e47783 support config the hls_nb_notify.
winlin e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts.
winlin e458305f81 add utc time format.
winlin 64b065e450 for hls callback, add duration of ts.
winlin 17c0a5c470 fix , support transform vhost of edge 2.0.155.
winlin 8401d9ac06 fix , config hls to disable cleanup of ts. 2.0.154.
winlin 76c1957260 enhance hls, increase piece one by one.
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151.
winlin 692b751da8 for , support config the m3u8/ts path for hls. 2.0.149.
winlin b6feb0742f fix , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
winlin fcab17741c fix , the dvr path rule changed.
winlin 0319e85f99 support config the audio overflow ratio.
winlin 2241ba0e34 for , , add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
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
winlin 59d9af8039 update conf
winlin 6d15d0ea99 for , refine code, add hstrs config.
winlin ffef62900f for , support adobe hds. 2.0.138.
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
winlin 5370493140 add ingest to mac.dev conf.
winlin 0ff49fd299 for , debug srs on xcode.
winlin b0953c1d3a add comments of audio profile supported by srs.
winlin b360fe279d remove libaacplus.
winlin 5d0cb7e68f update conf for rtsp
winlin 012c29e124 for , update the wiki.
winlin fb3fced8d0 for , revert dvr http api. 2.0.128.
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 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 7077b74d03 for , add dvr plan append.
winlin 95b4baee7c for , refine dvr code to more simple.
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 40fbfd8560 for , rtsp extract tcp/udp listener.
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 25af6c6847 for , use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.
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 52891b491a listen and serve stream caster mpegts over udp.
winlin 6b89ffbc1d add config section for stream caster.
winlin e0ee8de2fb for , srs http server support dash, flash request range in range or bytes.
winlin a647043a06 update readme and wiki url for http ts stream
winlin 7d86c6d9e9 for bug , refine for fast cache of http stream.
winlin 25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
winlin bb1331cc91 update conf.
winlin b735e29d05 refine conf, add port.
winlin e5ef4c2e66 update the conf of http static and stream.
winlin b7b268dfbf fix , support http live flv/aac/mp3 stream with fast cache. 2.0.100.
winlin eff2d81016 for , add http flv stream
winlin 2742c0d3c2 for , support http vhost mount.
winlin 4513486266 refine http server, support mount dir for vhost.
winlin dc11418c79 fix : http-callback support on_dvr when reap a dvr file. 2.0.89
winlin 7f60d472e6 remove the change vhost forward.
winlin 45724bfaec update conf for transcode.
winlin f881bc43b5 fix : dvr support custom filepath by variables. 2.0.87
winlin 75f2607685 fix , support security allow/deny publish/play all/ip. 2.0.86
winlin 28eedfc177 merge from 1.0release for , ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75
winlin 2e43a63bf4 fix , ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12
winlin eef8034632 merge from 1.0release for bug . 2.0.74
winlin 1dfac0bf1d fix , support disconnect publish connect when hls error. 1.0.11
winlin 595bf24a51 for bug , default to off the realtime(min-latency).
winlin 10297fab51 fix , support 0.1s+ latency. 2.0.70
winlin 68ade0a267 add log info for rtmp conn. change the mw_latency to 100 for realtime.
winlin a3de1c71fc reset the mw_latency to 350.
winlin 1311b6fe65 fix , support 10k clients. 2.0.67
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350.
winlin b1d7fbe668 fix , add mw(merged-write) config. 2.0.53
winlin 5589b13d2e for bug , support mr(merged-read) config and reload. 2.0.52.
winlin 59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlin e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx
winlin 6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx
winlin 83f266b9e2 fix , dvr segment add config dvr_wait_keyframe. 0.9.213.
winlin cc8dc0fee0 remove the not-supported features, add bug , .
winlin e9e0cd757c fix , support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.
winlin cf7504826b fix reload ingest bug, remove when disabled. 0.9.196
winlin 33bc8755ab refine code, add comments for ossrs.net monitor.
winlin 84450e1588 fix , fix http hooks bug, regression bug. 0.9.184.
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178
winlin 37ceadd865 sync the conf file
winlin 6f700f3f40 rename network_device_index to network
winlin f4ea48adcb rename network_device_index to network
winlin b334021836 add config item for the stat disk device name
winlin abef029610 refine full conf