1593 Commits (45009785fb56b00f89064fef644a951660a136cc)

Author	SHA1	Message	Date
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