2211 Commits (b20a68ad68f8a44f39cf73c2a0bfdf5deda33869)

Author	SHA1	Message	Date
winlin	e905fce847	For #1638, #307, add comments in RTMP/RTP message for RTC.	5 years ago
winlin	60c8b37f05	For #1638, #307, merge john, add NACK suport, remove debug code, verbose log	5 years ago
xiaozhihong	2b56f9ee59	add NACK suport, remove debug code, verbose log	5 years ago
winlin	12e99f1897	For #1638, #307, use webrtc adapter.js for demo.	5 years ago
winlin	a42cf3ae8d	For #1638, #307, refactor rtc config.	5 years ago
winlin	51af2b4779	For #1638, #307, rtc conf support ENV.	5 years ago
xiaozhihong	6c88f58079	remove debug code, fix rtc.html	5 years ago
winlin	d21ef106a0	Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc	5 years ago
xiaozhihong	027d34bbd3	add rtp shared packet	5 years ago
xiaozhihong	6decdc7838	adjust code style, fix some bug, add rtc session timeout	5 years ago
winlin	1382337cb4	Merge SRS3	5 years ago
winlin	856ed5a971	For #1635, inotify watch ConfigMap for reload. 3.0.134	5 years ago
winlin	bb509d23e2	For #1635, inotify watch ConfigMap for reload. 3.0.133	5 years ago
winlin	88368ed18d	For #1635, inotify watch ConfigMap for reload. 3.0.132	5 years ago
winlin	940798a9c7	For #1635, inotify watch ConfigMap for reload. 3.0.131	5 years ago
winlin	5e60c8f9cc	For #1635, inotify watch ConfigMap for reload. 3.0.130	5 years ago
winlin	9b663c070a	Fix #1635, support auto reaload config by inotify. 3.0.129	5 years ago
winlin	b33751e2c1	Merge SRS3	5 years ago
winlin	4b395f6e16	Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128	5 years ago
winlin	ed41ca867b	For #1594, detect and disable daemon for docker. 3.0.127	5 years ago
winlin	c1e07d6a96	For #1634, always check status in thread loop. 3.0.126	5 years ago
winlin	6a765ab849	Merge SRS3	5 years ago
winlin	6c55fd3e4b	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	5 years ago
winlin	c61c2a939f	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	5 years ago
HuyaJohn	da72caf8b9	h264 packet done, chrome play well	5 years ago
winlin	c78595c1fa	For #1634, refactor encoder output, support timestamp variables.	5 years ago
winlin	66b194cd63	For #1634, refactor encoder process management.	5 years ago
winlin	927c0c8e39	For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124	5 years ago
xiaozhihong	e831f3254a	some code	5 years ago
HuyaJohn	ff0e03800d	h264 rtp debuging	5 years ago
xiaozhihong	e2675109fb	fix rtp h264 packet bug	5 years ago
HuyaJohn	3ae510b843	rtp dispatch done, but video can not play in chrome	5 years ago
xiaozhihong	2f462775a0	rtp support	5 years ago
HuyaJohn	2e68c375e3	start coding flv->rtp	5 years ago
xiaozhihong	c62901a3ac	make code easy, wrap udp remux socket	5 years ago
winlin	5586c2a128	For #1612, refactor return value for RTSP initialize.	5 years ago
winlin	dcb0553cc8	For #1612, fix crash bug for RTSP. 4.0.12	5 years ago
winlin	12a74326e8	Merge pull request #1612 from xialixin/develop ... Fix disconnect RTSP connection has assertion, resulting in program exit	5 years ago
runner365	a2839aacdf	add h264 sei filter	5 years ago
HuyaJohn	b730458d51	add candidates ip list, add rtc_upload.html to test	5 years ago
xiaozhihong	9d5495c0c2	"stun and dtls done"	5 years ago
xiaozhihong	30d8b2209f	parse sdp	5 years ago
winlin	f917cc1e0c	For SRT, perfer mix_correct to true as default.	5 years ago
runner365	7f4cc6221c	1,solve audio timestamp bugs;2,solve video dts increase bugs	5 years ago
xiaozhihong	62563bdd81	rtc framework	5 years ago
winlin	ea305790df	For #1579, refactor log for gracefully quit.	5 years ago
winlin	90afd06c85	For #1615, support default app(live) for vmix SRT. 4.0.9	5 years ago
xiaozhihong	51abb0844e	rtp session manager, stun codding	5 years ago
winlin	ef2b123325	Merge branch '3.0release' into 4.0release	5 years ago
winlin	20b9d6ab02	For #1598, support SLB health checking by TCP. 3.0.123	5 years ago
xiaozhihong	bc22ebe949	add rtc http request and response, exchange sdp.	5 years ago
winlin	388ad61cdc	Merge branch '3.0release' into 4.0release	5 years ago
winlin	dc0f804452	For #1579, support start/final wait for gracefully quit. 3.0.121	5 years ago
winlin	0c48c42f36	Merge branch '3.0release' into 4.0release	5 years ago
winlin	58b40478b6	For #1579, support force gracefully quit. 3.0.120	5 years ago
winlin	eefd74e0e4	Merge branch '3.0release' into develop	5 years ago
winlin	3c597545b1	For #1579, support gracefully quit. 3.0.119	5 years ago
winlin	f4c7b882c5	For #1579, define signals for fast/grace quit and upgrade	5 years ago
夏立新	d6e11706ec	Fix disconnect RTSP connection has assertion, resulting in program exit	5 years ago
夏立新	df3ec15cd1	Fix checking the completion of one frame data in RTSP RTP stream	5 years ago
winlin	5be69d290f	For #1601, flush async on_dvr/on_hls events before stop. 3.0.118	5 years ago
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	5 years ago
Alex.CR	5f7d23f123	add srt parameter configure (#1599) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks * add srt parameter configure	5 years ago
winlin	bdc7973596	Merge branch '3.0release' into develop	5 years ago
winlin	fc769550db	Fix #665, fix HTTP-FLV reloading bug. 3.0.116	5 years ago
winlin	c6d914bc13	Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115	5 years ago
winlin	c50c51889a	For #1592, support ff_log_level and default to warning	5 years ago
winlin	2fa151726b	For #1592, rename ff_log_dir.	5 years ago
winlin	823b4fa56f	Merge branch '3.0release' into develop	5 years ago
winlin	a99cee2819	For #1186, refactor security check. 3.0.114	5 years ago
winlin	c51c378869	For #1186, refactor security check. 3.0.114	5 years ago
winlin	59439cf8b5	Merge branch '3.0release' into develop	5 years ago
winlin	4f39303f37	Fix #939, response right A/V flag in FLV header. 3.0.113	5 years ago
winlin	68efca4fa9	For #939, always enable fast FLV streaming.	5 years ago
winlin	a2a6ca8258	For #939, always enable fast FLV streaming.	5 years ago
winlin	77114c7df0	Merge SRS3	5 years ago
winlin	23ece94064	Fix #1206, dispose ingester while server quiting. 3.0.111	5 years ago
winlin	a6f88805f3	Remove test code	5 years ago
winlin	6ed6ce58e4	Merge SRS3	5 years ago
winlin	adf7ef4511	Fix #1230, racing condition in source fetch or create. 3.0.110	5 years ago
winlin	b605edb9b3	Merge 3.0	5 years ago
winlin	5d365bade8	Fix #1303, do not dispatch previous meta when not publishing. 3.0.109	5 years ago
winlin	88c9c13707	Update readme for SRT	5 years ago
winlin	2775a391e0	Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108	5 years ago
winlin	74154cdfd9	Fix #703, drop video data util sps/pps. 3.0.107	5 years ago
winlin	bbc7023f85	Merge SRS3	5 years ago
winlin	978d5e993b	Fix #1108, reap DVR tmp file when unpublish. 3.0.106	5 years ago
winlin	5d0833fcc3	Add author runner365	5 years ago
winlin	5f174552f3	Merge SRT	5 years ago
winlin	7c9b31815f	Refactor code, add stop for hybrid server to do cleanup.	5 years ago
winlin	2363d258de	Refactor hybrid server model	5 years ago
winlin	33c6bf1f8f	Refactor SRT, using reverse dependency, SRT depends on APP.	5 years ago
winlin	1959d1d920	Extract hybrid server for SRT	5 years ago
winlin	aacf519169	Revert log for forwarder in source	5 years ago
winlin	a7b8695cb0	Refactor code, include without path	5 years ago
winlin	f143757429	Use macro to disable SRT in code	5 years ago
runner365	5c5fd805c5	add srt mpegts to rtmp	5 years ago
winlin	a6fe4e80d3	For #1547, remove the SRS_OSX macro in code	5 years ago
winlin	9dbd049e79	For #1568, extract SrsSourceManager from SrsSource.	5 years ago
winlin	0e750ab3eb	For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100	5 years ago
winlin	7240fe3040	For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99	5 years ago
winlin	857c783efc	For #1509, release coroutine when source is idle. 3.0.98	5 years ago
runner365	aeee3011ef	add srt server file	5 years ago
winlin	6c1067d56a	Merge from 2.0	5 years ago
winlin	dd46a4f700	Fix #1554, support logrotate copytruncate. 2.0.272	5 years ago
winlin	c08b6f1961	Merge 2.0, support logrotate copytruncate. 3.0.96	5 years ago
winlin	731e87876e	Fix #1554, support logrotate copytruncate. 2.0.271	5 years ago
Michael.Ma	459488bcf8	fix logrotate empty file hole issue (#1561) ... * fix logrotate empty file hole issue refer to https://github.com/ossrs/srs/issues/1554	5 years ago
winlin	10464a5fbe	Always use string instance to avoid crash risk. 3.0.95	5 years ago
winlin	bc6c61e546	Fix #1543, use getpeername to retrieve client ip. 3.0.92	5 years ago
winlin	45aa325722	Improve test coverage for config.	5 years ago
winlin	0fd0114ee6	Improve test coverage for config.	5 years ago
winlin	7136c7c9b8	Improve test coverage for config.	5 years ago
winlin	de87b64f59	Improve test coverage for config.	5 years ago
winlin	a71d93188b	Improve test coverage for config.	5 years ago
winlin	d783a12f89	Happy 2020	5 years ago
winlin	8a28a11648	For #299, increase dash segment size for avsync issue. 3.0.89	5 years ago
winlin	d11a7b2e00	For #299, fix some bugs in dash, it works now. 3.0.88	5 years ago
winlin	b9d720c927	For #1105, http server support mp4 range.	5 years ago
winlin	7584c47aaf	Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86	5 years ago
winlin	2115d5d22a	For #1488, add test and improve coverage for parsing client ip.	5 years ago
winlin	316cab794a	For #1488, pass client ip to http callback.3.0.85	5 years ago
winlin	d367730883	For #1488, support parsing original ip from header for proxy	5 years ago
winlin	09b65aff96	For #1488, pass client ip to http callback. 2.0.269	5 years ago
winlin	a11461905b	Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82	5 years ago
winlin	e6e4bd7fb4	Remove useless warning log for reloading.	5 years ago
winlin	7eccc9da26	For #1508, support chunk length and content in multiple parts.	5 years ago
winlin	4382ced3bf	For #1508, Refactor srs_is_digital, support all zeros.	5 years ago
winlin	d7078a72d4	For #1520, add TODO list for configing server itself in coworker.	5 years ago
winlin	acfeb8a66f	Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74	5 years ago
winlin	cef7ec79b3	Detect whether flash enabled for srs-bwt.	5 years ago
winlin	dc1afc142f	Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72	5 years ago
winlin	191b07668d	Refactor HTTP stream to disconnect client when unpublish	5 years ago
winlin	1e83da7812	Refactor HTTP recv request timeout to 15s.	5 years ago
winlin	2df1dcb05a	Fix HTTP-FLV and VOD-FLV conflicting bug.	5 years ago
winlin	d9842b0371	Refactor HttpResponseWriter.write, default to single text mode.	5 years ago
winlin	8cdb7cc727	Add test for vod stream handler	5 years ago
winlin	ca2b68f428	Refactor header of HTTP message by using SrsHttpHeader.	5 years ago
winlin	6f453e7f46	For #547, #1506, default hls_dts_directly to on. 3.0.71	5 years ago
winlin	78da67e8d1	For #1229, fix the security risk in logger. 3.0.69	5 years ago
winlin	ad70589347	For #1229, fix the security risk in HDS. 3.0.69	5 years ago
winlin	1c227f4f8a	Refine logger for hls_dts_directly	5 years ago
winlin	b4870a6d6f	Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68	5 years ago
winlin	31f341e205	For #1506, refine the AAC samples guess algorithm.	5 years ago
winlin	52c6c7c45d	For #1506, ignore video when codec is unknown.	5 years ago
winlin	5a3fd1e68a	Release v3.0-a2, 3.0.67	5 years ago
winlin	517974d451	Refine redirect flow for origin cluster	5 years ago
winlin	e5285ecabf	Fix #1501, use request ip for origin cluster. 3.0.66	5 years ago
winlin	4cd03a7c06	Refine debug info for edge. 3.0.64	5 years ago
winlin	e045b0a619	We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59	6 years ago
winlin	88df9a2497	Support go-oryx rtmplb with proxy protocol. 3.0.56	6 years ago
winlin	130c545f9a	Refine origin cluster log	6 years ago
winlin	1a65927b1b	Remvoe HSTRS warning.	6 years ago
winlin	5d17bb8bb0	Remove KAFKA. 3.0.53	6 years ago
winlin	5d8fb01b45	Fix #1352, fix typo of daemon.	6 years ago
winlin	ffe391aa49	Fix HLS no PMT/PAT bug.	6 years ago
winlin	c71b867b4f	Refine comments.	6 years ago
winlin	3d57c1c9bc	Refine ST service.	6 years ago
winlin	202a584aab	Refine ST service.	6 years ago
winlin	a4160308f5	Refine comments.	6 years ago
winlin	b02527dec0	Refine usage.	6 years ago
winlin	2de3045b25	Remove noisy informations.	6 years ago
winlin	6dbe79ad02	Remove noisy informations.	6 years ago
winlin	ad3749a4d5	Remove noisy informations.	6 years ago
winlin	0564cdedec	Refine typo in comments.	6 years ago
winlin	6b2c71d385	Refine typo in files. 3.0.51	6 years ago
winlin	45009785fb	Refine typo in app.	6 years ago
winlin	aac8a13f42	Refine typo in app.	6 years ago
winlin	e436cc5665	Refine SrsBasicRtmpClient in time unit.	6 years ago
winlin	c6dcc76fea	Refine SrsRequest.duration in time unit.	6 years ago
winlin	73e71d26ea	Refine SrsGopCache::start_time in time unit.	6 years ago
winlin	1626942d29	Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed.	6 years ago
winlin	d306ee7506	Refine ms in time unit	6 years ago
winlin	5af572ab50	Refine SrsRtmpConn.duration in time unit.	6 years ago
winlin	f6f49c68da	Refine SrsRecvThread timeout in time unit	6 years ago
winlin	6b587c5e0f	Refine SrsUdpPacketRecvCycleInterval in time unit.	6 years ago
winlin	283c4c7449	Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit.	6 years ago
winlin	522cbf1df8	Refine SrsHourGlass in time unit.	6 years ago
winlin	f5a1f9b774	Refine SrsFragment.start_dts in time unit	6 years ago
winlin	288bed6e26	Refine SrsTcpClient.timeout in time unit.	6 years ago
winlin	33c66b64c5	Refine name TMMS to TIMEOUT	6 years ago
winlin	5505eceeac	Refine SrsTcpClient.timeout in time unit.	6 years ago
winlin	feb34ed225	Refine SrsStSocket in time unit	6 years ago
winlin	d3dc45f357	Refine set_recv_timeout in time unit	6 years ago
winlin	f4bee37e76	Refine set_send_timeout in time unit	6 years ago
winlin	a1398892d0	Refine const timeouts in time unit	6 years ago
winlin	61afca7160	Refine SrsTcpClient timeout in time unit	6 years ago
winlin	e9770933a6	Refine dash controller publish or unpublish	6 years ago
winlin	6380e8f1c0	Fix HLS segment close bug	6 years ago
winlin	138d1e3cad	Refine get_vhost_http_remux_fast_cache in time unit	6 years ago
winlin	010e35bec2	Refine get_hds_fragment and get_hds_window in time unit	6 years ago
winlin	917f6d066d	Refine get_hls_window in time unit	6 years ago
winlin	ca705a6f62	Refine get_hls_fragment in time unit	6 years ago
winlin	402e614471	Refine get_send_min_interval in time unit	6 years ago
winlin	c1b64ba24f	Refine get_queue_length and set_queue_size in time unit	6 years ago
ME_Kun_Han	af49e218ce	for #1349, use correct value for SRS_CONF_DEFAULT_HLS_ON_ERROR_IGNORE and SRS_CONF_DEFAULT_HLS_ON_ERROR (#1351)	6 years ago
winlin	465d255940	Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit	6 years ago
winlin	980c32aee6	Refine on_hls duration in time unit	6 years ago
winlin	5f3d09c8a0	Refine hls muxer duration in time duration.	6 years ago
winlin	41d1e91540	Fix start and end time bug	6 years ago
winlin	bc1189caee	Refine SrsFragment.duration in time unit.	6 years ago
winlin	0879bef9b2	Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT	6 years ago
winlin	53357e92fe	Refine headers	6 years ago
winlin	92980a0ca2	Refine SRS_CONSTS_RTMP_TMMS in time unit	6 years ago
winlin	5b0e0d0838	Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit	6 years ago
winlin	695d430dcf	Refine SrsMessageQueue.duration in time unit.	6 years ago
winlin	170cca1f58	Refine srs_get_system_startup_time in time unit	6 years ago
winlin	6c12aa0eca	Refine srs_update_system_time in time unit	6 years ago
winlin	9b7c0802a9	Refine srs_update_system_time in time unit	6 years ago
winlin	9b1222a79c	Refine get_publish_normal_timeout in time unit	6 years ago
winlin	170872135d	Refine get_publish_1stpkt_timeout in time unit	6 years ago
winlin	d6828a3e58	Refine get_mw_sleep in time unit	6 years ago
winlin	839a496d50	Refine get_mr_sleep in time unit	6 years ago
winlin	5df8f2f6c1	Refine get_pithy_print in time unit	6 years ago
winlin	60f9561d2d	Refine get_heartbeat_interval in time unit	6 years ago
winlin	5937304717	Refine get_dash_timeshift in time unit	6 years ago
winlin	12cf17ef6b	Refine get_dash_update_period in time unit	6 years ago
winlin	4302ab7708	Refine get_dash_fragment to time unit	6 years ago
winlin	bb6389143f	Refine get_bw_check_interval in time unit	6 years ago
winlin	74c1944e15	Refine config, allow parse multiple times.	6 years ago
winlin	6239dfa489	Apply time unit	6 years ago
winlin	7037f6a197	Cover more ST Coroutine code	6 years ago
winlin	1ce040cc2c	Cover more ST Coroutine code	6 years ago
winlin	3d5508e088	Cover more ST Coroutine code	6 years ago
winlin	a9a720e32f	Cover ST Coroutine and time unit. 3.0.48	6 years ago
winlin	f2b4bc7110	Fix #1304, Fix ST coroutine pull error. 3.0.47	6 years ago
winlin	a8781aee3e	For #1304, Default HSTRS to on. 2.0.264	6 years ago
winlin	633a9a0d35	Merge #1324, Remove dead code	6 years ago
winlin	b9750baa52	For #1339, Support HTTP-FLV params.	6 years ago
winlin	91c462b6ba	For #1339, Support HTTP-FLV params. 2.0.262	6 years ago
YLX	ab833943e1	fix: support parse flv query params to http callback (#1339)	6 years ago
winlin	073d42ca7d	CI: Refine hls ts context writer	6 years ago
winlin	b2d1d84634	Change to 2019	6 years ago
winlin	6234905532	Refactor ISrsKbpsDelta	6 years ago
winlin	c26b475bae	Refine kbps, stub wall clock	6 years ago
winlin	4c40370986	Refine kbps more testable	6 years ago
winlin	16fa4c588a	Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter	6 years ago
winlin	6e75993e7f	Change public virtual to virtual public	6 years ago
winlin	2e9bf2af83	Always enable SRS_StreamCaster	6 years ago
winlin	aa1a5442f9	Always enable SRS_Ingest	6 years ago
winlin	c6844527fb	Always enable SRS_SSL	6 years ago
winlin	0bc7fdbb35	Always enable SRS_SSL	6 years ago
winlin	8e294709b0	Always enable SRS_STAT	6 years ago
winlin	330100769f	Always enable SRS_TRANSCODE	6 years ago
winlin	ba4ef34d27	Merge 2.0release	6 years ago
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	7 years ago
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	7 years ago
winlin	8e55ef4b60	Refine code	7 years ago
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	7 years ago
winlin	ee068cf120	For #1109, Support without ssl for HLS key.	7 years ago
winlin	522fba99aa	Merge branch 3.0release into harlanc-3.0release	7 years ago
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	7 years ago
Harlan	22c5af62cf	Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release ... # Conflicts: # trunk/src/kernel/srs_kernel_utility.hpp	7 years ago
Harlan	ac6b37de4b	rewrite ff_data_to_hex	7 years ago
winlin	1cc72df134	Fix #910, Support HTTP FLV with HTTP callback. 3.0.39	7 years ago
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	7 years ago
winlin	928c6ab091	For #1181, Add utest	7 years ago
winlin	01d8bba455	For #1181, Refine code to write utest	7 years ago
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	7 years ago
winlin	d607c7f905	Refine HTTP-FLV latency, support realtime mode.3.0.38	7 years ago
winlin	03ac48f8fa	Merge 2.0, for FLV latency	7 years ago
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	7 years ago
winlin	580c94c8c0	Refine code	7 years ago
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	7 years ago
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	7 years ago
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	7 years ago
winlin	09dbda5b18	For #1031, SRS forwarder support douyu.com.	7 years ago
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	7 years ago
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	7 years ago
winlin	d27db215df	For #1176, should not close fd when success.	7 years ago
winlin	e4742ddac7	Merge 2.0release	7 years ago
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	7 years ago
Harlan	e9cb8210fc	fix default value error	7 years ago
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	7 years ago
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	7 years ago
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	7 years ago
Harlan	52596a0b04	add HLS encryption feature	7 years ago
winlin	0d78b908a7	Fix client tools resolve dns failed bug	7 years ago
winlin	bd797ad385	Fix utest build failed for ::atoi	7 years ago
winlin	459272b94c	Merge #1077 from 2.0release	7 years ago
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	7 years ago
winlin	c70421e656	Fix #464, support origin cluster	7 years ago
winlin	2f09ec4353	For #464, refine result of origin cluster api	7 years ago
winlin	92f2bcd878	For #464, support config origin cluster	7 years ago
winlin	55c96192e2	For #464, refine code	7 years ago
winlin	ec362b2774	For #464, query origin info and ip addresses	7 years ago
winlin	469250f850	For #464, support origin cluster api	7 years ago
winlin	d0fbf44d18	For #464, support config for origin cluster.	7 years ago
winlin	a2cefe4dbd	For #1059, show more information from stream	7 years ago
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	7 years ago
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	7 years ago
winlin	93d3e1464a	For #1045, revert macro for TCP keepalive detection, use system macro	7 years ago
winlin	366309ce2d	For #1045, revert macro for TCP keepalive detection, use system macro	7 years ago
winlin	049e7c82c0	Merge #1044, for #1045, set TCP SO_KEEPALIVE	7 years ago
winlin	911cd448f1	Merge #1045, for #1044, TCP connection alive detection. 2.0.245	7 years ago
juntaoliu	a6871052af	set tcp keepalive for tcp socket (#1045)	7 years ago
winlin	ca1395a807	Change date from 2017 to 2018	7 years ago
winlin	922a8f3a5c	For #988, refine code.	7 years ago
winlin	823dc2df21	Refine help	7 years ago
Thomas Dreibholz	feaae341b9	IPv6 support (for 3.0 release) (#988) ... * IPv6 support, part 1. * IPv6 support, part 2. * Some more IPv6 work. * Made functions for address:port paŕsing IPv6-capable. * Fixed type (compile warning). * Fixed formatting. * Reverted option change. * Replaced abort() by proper error handling. * Also retrieving local IPv6 addresses now.	7 years ago
winlin	db08f1586c	For #913, APP support complex error.	7 years ago
winlin	e2c1f58674	For #913, APP support complex error.	7 years ago
winlin	6eae93258a	For #913, APP support complex error.	7 years ago
winlin	204ef041da	For #913, Kernel MP4 FLV HTTP support complex error.	7 years ago
winlin	9802dc326e	For #913, source support complex error	8 years ago
winlin	abcaba33ee	For #913: TS/HLS/MPEGTS support complex error	8 years ago
winlin	20a42599f3	For #913, http callback use complex error	8 years ago
winlin	fd91df9411	For #913, reload use complex error	8 years ago
winlin	9f5224c34a	For #913, use complex error for http	8 years ago
winlin	661eb8b37c	For #913, use complex error for reload utc time	8 years ago
winlin	5c9a12e72a	For #913, use complex error for listener	8 years ago
winlin	71dd3f3137	For #913, use complex error for server handler.	8 years ago
winlin	9db2a04c3b	For #913, coroutine support complex error.	8 years ago
winlin	b5c14938d9	For #913, config and log support complex error.	8 years ago
winlin	860aac3e50	For #913, config reload and persistence	8 years ago
winlin	7cac35a289	For #913, source cycle error	8 years ago
winlin	a20e2c3ef6	For #913, refine server utility	8 years ago
winlin	ca9f0bdb1e	For #913, refine server initialize st	8 years ago
winlin	4e4091231e	Refine object create in server.	8 years ago
winlin	93710c7489	For #913, refine the error mechanism	8 years ago
winlin	bb200b5d2d	For #913, add complex error.	8 years ago
winlin	69374c8d6d	For #299, use format for v/a sequence header.	8 years ago
winlin	9ca36970aa	Fix #908, use empty coroutine to avoid NULL pointer.	8 years ago
winlin	0e9e1792fe	For #299, write fMP4 for DASH.	8 years ago
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	8 years ago
winlin	54411e0768	Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23	8 years ago
winlin	6993ac226f	For #906, #902, use coroutine for reusable2 thread	8 years ago
winlin	ea9a5f26d9	For #906, #902, use coroutine for reusable thread	8 years ago
winlin	2ed2513f08	For #906, #902, use coroutine for one cycle thread	8 years ago
winlin	b21f92f97a	For #906, #902, remove the thread start and stop event	8 years ago
winlin	3ffb0980f5	For #906, #902, use connection manager to remove connection	8 years ago
winlin	44f542f77f	For #906, #902, replace the endless thread with coroutine	8 years ago
winlin	fc380fe48d	For #906, #902, refine thread object.	8 years ago
xialixin	92c8c0505d	Fix the timebase bug, change from us to ms. (#876) ... * fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL) * fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000) * fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)	8 years ago
HungMingWu	815d50f00a	Remove warning: C++11 requires a space between string literal and macro (#874) ... On Ubuntu 17.04, the default gcc compiler version is 6.3.0. It switch standard from c++98 to c++11. So it would generate verbose warnings.	8 years ago
winlin	a58874178b	Fix merge build failed.	8 years ago
winlin	f97260be1d	Merge SRS2	8 years ago
winlin	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	8 years ago
walkermi	79e4f9f3a0	fixed compile error when add --log-info (#860) ... * Update srs_app_server.cpp fixed compile error when add --log-info * Update srs_app_mpegts_udp.cpp fixed compile error when add --log-info	8 years ago
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	8 years ago
HungMingWu	98d4b6ae11	Refine srs_kernel_codec audio & video config code (#854)	8 years ago
winlin	c97f2233a2	Merge SRS2 for #851	8 years ago
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	8 years ago
winlin	bcd24126c5	Update comments for HLS	8 years ago
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	8 years ago
winlin	18d9f6c8f1	Fix build failed.	8 years ago
winlin	1054b0a90f	Merge SRS2	8 years ago
winlin	33a0abdeff	Fix #844, support Haivision encoder. 2.0.238	8 years ago
winlin	d6e28bde69	Merge from SRS2.	8 years ago
HungMingWu	14acc59a19	Refine kernel/mp4 code (#823)	8 years ago
haofz	52b6823a90	fix #826, fix memory leak in streamCasterFlv (#836)	8 years ago
winlin	33375db401	Merge from SRS2, for #834	8 years ago
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	8 years ago
winlin	7d618fed43	For #820, fix utest failed.	8 years ago
winlin	e3526c0cf6	For #820, modules use service only.	8 years ago
winlin	ff822b55cd	For #820, extract service module.	8 years ago
winlin	0a57a46016	Refine LICENSE	8 years ago
winlin	f32aab3d92	For #299, refine code.	8 years ago
winlin	2980e7d3ef	For #813, refine code.	8 years ago
Chengdong Zhang	8ad934a8a4	srs_info use not available variable (#813) ... srs_info use not available variable. Variable has been removed or changed.	8 years ago
winlin	9ab5e6a916	For #299, fix bug of fragment url	8 years ago
winlin	c71e8fa947	For #299, fragment reap workflow	8 years ago
winlin	721a8457c2	For #299, Refine init mp4, use fragment	8 years ago
winlin	8d679a6f9a	For #299, use fragment for dvr FLV/MP4	8 years ago
winlin	da4c390d69	For #299, extract fragment and fragment window for hls	8 years ago
winlin	6da6e0511d	For #803, should refine code.	8 years ago
Chengdong Zhang	a6eebacc99	Streams API is not correct. (#800) ... HTTP API for streams is not correct. When stream stopped, API does not remove it.	8 years ago
winlin	3ec9df6578	For #299, A/V init mp4 are fine.	8 years ago
winlin	886930c22a	For #299, refine the comments.	8 years ago
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	8 years ago
winlin	44014683e1	Refine thread.	8 years ago
winlin	c849010fe2	Refine api for srs-librtmp	8 years ago
winlin	747d6f2f52	For #299, write legal MPD, fix CORS.	8 years ago
winlin	8ab727f3c5	For #299, write MPD file.	8 years ago
winlin	d786d61685	Merge branch '2.0release' into develop	8 years ago
winlin	0059b1cf7a	For #783, use directly free to replace auto free	8 years ago
ljx0305	b0d16840b5	fix Repeated release (#783) ... fix Repeated release	8 years ago
winlin	cee9d736a4	for #299, refine code.	8 years ago
winlin	ede1c34a25	for #299, refine the signature of api for hls/dash	8 years ago
winlin	2fcd3972c1	for #299, refine the encoder object name	8 years ago
winlin	2a4f57a587	Fix #301, User must config the codec in right way for HLS. 3.0.18	8 years ago
winlin	d612a21bad	for #299, refine audio codec object name	8 years ago
winlin	caf69f193d	for #299, refine the codec object name	8 years ago
winlin	d7458c4e72	For #299, refine the codec to format-frame-sample chain.	8 years ago
winlin	c4a510b834	For #299, refine the codec info structure.	8 years ago
winlin	5e419c66f8	For #299, add dash files.	8 years ago
winlin	7fd221ef63	Always enable DVR	8 years ago
winlin	8e5d4dc73d	always enable http and hls	8 years ago
winlin	477414106a	add dash files.	8 years ago
winlin	5fec59ace2	merge from srs2, fix #503	8 years ago
winlin	99bffea328	fix #503, disable utilities when reload a source. 2.0.233	8 years ago
winlin	afbc3443f3	fix #738, support DVR general mp4. 3.0.17	8 years ago
winlin	3209ad29e0	for #738, refine code for DVR mp4.	8 years ago
winlin	0a054cd6bd	for #738, remove the dvr plan append for it's no use	8 years ago
winlin	8c01f52372	for #738, refine the dvr segmenter.	8 years ago
winlin	733ba73d54	for #738, write mp4 samples.	8 years ago
winlin	9d21a8bb33	for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov).	8 years ago
winlin	ac7ee10b60	fix #751,#756, refine code	8 years ago
Chengdong Zhang	80540e4dc1	change TAB space ... change TAB space for line 794	8 years ago
eagle-zhang	7b02e3543f	Clients Api support start and count ... Clients Api support start and count line 794~810 && line 830	8 years ago
winlin	eaa222f034	for #742, refine the file reader and writer interface.	8 years ago
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	8 years ago
winlin	136a7ef488	for #299, refine docs.	8 years ago
winlin	a1fcf66f32	for #742, always enable http utilities.	8 years ago
winlin	79def81792	for #742, refine the rtmp conn, use info as data cluster.	8 years ago
winlin	39aee2b318	for #742, fix publish recv thread bug.	8 years ago
winlin	954bb186c1	identify the flash and fmle for recv thread.	8 years ago
winlin	4583a63789	for #742, refine code for recv thread.	8 years ago
winlin	a07986f4ee	for #742, refine code	8 years ago
winlin	5c959fc781	merge from srs2, for kbps free io	8 years ago
winlin	6706bda42c	for #752, release the io then free it for kbps. 2.0.232	8 years ago
winlin	a3ea83f504	directly free the transport, not need to close for maybe NULL	8 years ago
winlin	99c13fb1c1	convert ms to us for st	8 years ago
winlin	7bfb648bd8	refine the meta cache name	8 years ago
winlin	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	8 years ago
winlin	310032d8d8	merge srs2, timestamp overflow for ATC.	8 years ago
winlin	d76419e3bb	fix #749, timestamp overflow for ATC. 2.0.230	8 years ago
cenxinwei	762d7a8884	fix publish_normal_timeout 配置读取错误	8 years ago
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	8 years ago
winlin	dca9749f37	for #742, refine the object live cycle. 3.0.15	8 years ago
winlin	f4c0af8bfc	refine code remove dup api for #742	8 years ago
winlin	1ed5118246	refine the spaces, no TABS	8 years ago
winlin	750f4413c8	merge srs2 for #536	8 years ago
winlin	142a9733b2	refine encoder code for #536.	8 years ago
winlin	ccb250f3bc	merge srs2. convert ts aac audio private stream 1 to common.	8 years ago
winlin	e6eafd3b97	fix #740, convert ts aac audio private stream 1 to common. 2.0.229	8 years ago
winlin	7fe60b5bbf	fix #735 config transform refer_publish invalid. 3.0.14	8 years ago
winlin	7bbb3bae42	merge srs2	8 years ago
winlin	e3aa34ec5f	fix #736, recovery the hls dispose. 2.0.227	8 years ago
Himer	afa704bca5	Update srs_app_source.cpp ... enabled 为true才进行转发实例创建	8 years ago
winlin	a1ae48f4ac	Merge branch '2.0release' into develop	8 years ago
winlin	6fbda2ae3f	for #635, refine hls open/close gop.	8 years ago
winlin	ae1920e91a	Merge branch '2.0release' into develop	8 years ago
winlin	4104f25069	for #635, support IDR and NonIDR(open-gop).	8 years ago
winlin	1dd877c0d6	merge srs2	8 years ago
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	8 years ago
winlin	d49f195bbf	fix #734, log format error.	8 years ago
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	8 years ago
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	8 years ago
winlin	8bdf50b14d	update feature list	8 years ago
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	8 years ago
winlin	7ac932cfa0	update to 2013-2017	8 years ago
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	8 years ago
winlin	f6661989af	fix typo for #513, #691	8 years ago
winlin	664844b5f5	merge from srs2. for #513.	8 years ago
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	8 years ago
winlin	f30b3073a2	refine the cros of api for flv	8 years ago
winlin	3df8f11884	refine thread stop	8 years ago
winlin	8935fe8897	merge srs2.	8 years ago
winlin	aca8a79d95	fix #713, disable the source cleanup. 2.0.223	8 years ago
winlin	9ba4bed648	merge srs2	8 years ago
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	8 years ago
winlin	439c67018d	remove unused macros.	8 years ago
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	8 years ago
winlin	2d387035cd	refine the global variables.	8 years ago
winlin	b06203e777	dispose kafka	8 years ago
winlin	9a3674c624	refine kafka	8 years ago
winlin	f6c8e02cca	Merge branch '2.0release' into develop	8 years ago
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	8 years ago
winlin	0a8d40925f	merge from 2.0	8 years ago
ME_Kun_Han	f107f404ea	fix bug for issues #654 (#426)	8 years ago
winlin	5796e4bf89	merge from srs2	8 years ago
hankun	4f09bcce9f	fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666)	9 years ago
winlin	112d98ffdb	merge srs2.	9 years ago
ME_Kun_Han	7058411cb8	fix the core dump when trying to close srs (#386)	9 years ago
winlin	3659eec9d1	update the cwd	9 years ago
winlin	0e308b0fa1	merge srs2, support oryx	9 years ago
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	9 years ago
winlin	b748fac23a	support asprocess for oryx. 2.0.218	9 years ago
winlin	2a01540433	support change work_dir for oryx.	9 years ago
winlin	b5d466f3d2	update utest	9 years ago
winlin	09895fcfc2	Merge branch '2.0release' into develop	9 years ago
Star Brilliant	a164c90e28	Flush the stdout buffer after logging to console ... Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n. However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half). By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.	9 years ago
winlin	b24d1de377	Merge branch '2.0release' into develop	9 years ago
winlin	590e951739	fix memory leak of source.	9 years ago
winlin	0e9318e5d8	merge from 2.0	9 years ago
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	9 years ago
winlin	8ad7da1cb6	merge from 2.0	9 years ago
xubin	49853d2b8a	修复forward崩溃	9 years ago
winlin	7d96a33207	Merge branch '2.0release' into develop	9 years ago
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	9 years ago
winlin	36eb0981ec	merge from 2.0release	9 years ago
intliang	3fbe9d2442	fixed crash by improper srs_info use.	9 years ago
winlin	eed4626c35	use larger limit	9 years ago
winlin	8db25a0bf5	fix the log for mmap.	9 years ago
winlin	214eda745d	open null dev, not close stdout or stderr.	9 years ago
winlin	03469fc37d	refine code for process fork.	9 years ago
winlin	ce8f3b4478	refine the dup2 of stdout and stderr.	9 years ago
winlin	ae8bd4c2aa	should never close the fd 3+, for it myabe used.	9 years ago
winlin	a6dc17a67d	support redirect stdout by >	9 years ago
winlin	dfe5306327	fix process bug.	9 years ago
winlin	61c0c168b9	merge from srs2.	9 years ago
winlin	266397acee	merge from srs2	9 years ago
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	9 years ago
winlin	f971538cf3	refine http, support no host.	9 years ago
winlin	2941328ee8	rtmp edge support 302 redirect.	9 years ago
winlin	d81b2cb140	support hls mount to vhost and reload	9 years ago
winlin	041040b846	ignore ingester when vhost disabled.	9 years ago
winlin	eac5440559	merge from srs2 #558 #559	9 years ago
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	9 years ago