1701 Commits (b3b76b0ca6794aafc84537aafaa46c6b82961bd8)

Author	SHA1	Message	Date
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
tufang14	56bffb6646	Update srs_app_thread.cpp	9 years ago
flowerwrong	d42a58faf4	Keep blank of line	9 years ago
tufang14	233ff11172	srs reusable thread need join	9 years ago
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	9 years ago
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	9 years ago
winlin	5338f21439	merge from srs2	9 years ago
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	9 years ago
winlin	dc38ae1687	show first message when not show version.	9 years ago
winlin	9d22d09646	show signature of server.	9 years ago
winlin	973194c663	merge from srs2.	9 years ago