3564 Commits (3bd7978b59cc16c4e390474358f24da06385ebd2)

Author	SHA1	Message	Date
winlin	63ac93a642	Merge #1236 from 2.0release	6 years ago
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	6 years ago
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	6 years ago
winlin	3f009937ee	Merge #1237 from 2.0release	6 years ago
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	6 years ago
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	6 years ago
winlin	8e55ef4b60	Refine code	7 years ago
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	7 years ago
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	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
winlin	74d5d15c9f	Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release	7 years ago
winlin	1e054d2bcc	Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree	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	bf12a45274	add configuration instructions for hls encryption	7 years ago
Harlan	ac6b37de4b	rewrite ff_data_to_hex	7 years ago
winlin	a9b5d65ca7	For #1202, Support auth_key param for srs player	7 years ago
winlin	728ddd133b	For #1202, Support edge/forward to Aliyun CDN. 3.0.40	7 years ago
winlin	74a87d54f2	For #1202, Support edge/forward to Aliyun CDN. 2.0.255	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	31945c244d	For #1110, Refine code.	7 years ago
winlin	455a060fa5	Merge 2.0	7 years ago
winlin	ee43fc92ae	For #1110, Refine conf	7 years ago
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	7 years ago
winlin	82699ff616	Refine code for librtmp	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	41c6e833b9	Replace hex to string to match MIT license. 3.0.33	7 years ago
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	7 years ago
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	7 years ago
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	7 years ago
winlin	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	7 years ago
winlin	608c88b8f2	Merge 2.0release	7 years ago
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	7 years ago
winlin	551863a7ed	Refine code	7 years ago
winlin	693194dffe	Merge 2.0release	7 years ago
winlin	d27db215df	For #1176, should not close fd when success.	7 years ago
winlin	e4742ddac7	Merge 2.0release	7 years ago
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	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	45a57acbb4	fix bug	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	bb4e16ae3c	fix create dir success result check (#1080)	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	449c632e49	For #464: Add example for origin cluster	7 years ago
winlin	bd797ad385	Fix utest build failed for ::atoi	7 years ago
winlin	459272b94c	Merge #1077 from 2.0release	7 years ago
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	7 years ago
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	7 years ago
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	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	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	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	82457cda4b	Change date from 2017 to 2018	7 years ago
winlin	ca1395a807	Change date from 2017 to 2018	7 years ago
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	7 years ago
RocFang	d22d7afd83	update init.d file (#1039)	7 years ago
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	7 years ago
winlin	b426036832	Merge #1033, allow user to add some specific flags. 2.0.244	7 years ago
RocFang	015e76cb3f	Update configure (#1033) ... allow user to add some specific flags.	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	aebbbadf42	For #913, Service support complex error.	7 years ago
winlin	15aea686c3	For #913, KAFKA, RTSP support complex error.	7 years ago
winlin	70a20ffadb	For #913, RTMP support complex error.	7 years ago
winlin	60accb6e54	For #913, AMF0 and RTMP 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
ME_Kun_Han	3744606c9b	fix bug: parsing Exp-Golomb codes failed (#978)	8 years ago
winlin	baa55f14b9	Change stable release to SRS2	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	e135ab59d9	Fix the utest failed for chunk_size	8 years ago
winlin	6d4315fc3c	Disable valgrind by default	8 years ago
winlin	0ad4b65a56	Disable valgrind for osx.	8 years ago
winlin	b3825c4021	Fix warnings	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	7275fd5397	Fix #916, build failed for headers for 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	372a9e5cb3	Fix #915, string ends with	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	58521751c3	Fix #299, support experimental MPEG-DASH. 3.0.25	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	baed1cc043	For #821, support parse dash video segment	8 years ago
winlin	8cc3ab2fa2	For #821, print mdat and udat	8 years ago
winlin	beae090d67	Refine logger header	8 years ago
winlin	4f6f8a8244	Fix verbose bug, for #821	8 years ago
winlin	6c64297264	Fix #821, support MP4 file parser. 3.0.24	8 years ago
winlin	12a55cd0c2	Fix build failed.	8 years ago
winlin	86f3bd7a0f	Fix build failed.	8 years ago
winlin	121eadbc07	Fix build failed.	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
winlin	5792c462b8	Merge branch 'develop' into 3.0release	8 years ago
winlin	c4966484e1	For #893, #899, merge SRS2	8 years ago
winlin	e8cb2e6be4	Merge #899 to fix #893, ts PES ext length. 2.0.243	8 years ago
OtterWa	d1bd6993c5	fix ts decode (#899)	8 years ago
winlin	1e3550a52c	For #821, Parse basic mp4 boxes.	8 years ago
HungMingWu	234904c206	Refine Refine Refine kernel/ts code (#891)	8 years ago
winlin	dd1cca45cc	Remove non-exists conf file.	8 years ago
winlin	eaccbd0f85	Support print MP4 box.	8 years ago
winlin	fe43a31d06	Parse all mp4 boxes	8 years ago
winlin	366d6bcb82	Refine code	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	e8ea27088a	Refine Refine kernel/ts code (#881)	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	9a2a6ab95f	Merge SRS2	8 years ago
winlin	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	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	6ee85aea83	Refine mp4, extract mp4 box reader.	8 years ago
winlin	c9bed5a8bf	Refine mp4 codec for mdat.	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
winlin	1c139d8fd8	Merge #846, fix fd leak for FLV stream caster. 2.0.237	8 years ago
haofz	52b6823a90	fix #826, fix memory leak in streamCasterFlv (#836)	8 years ago
winlin	8d35585c13	Merge #841, avoid the duplicated sps/pps in ts. 2.0.236	8 years ago
ME_Kun_Han	bd2a1f9d3c	fixed bug: video rendering in hls stream generates only vertical parttern (#841)	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	8b7566a007	Refine code	8 years ago
winlin	032107dbf0	Refine hls ingester	8 years ago
winlin	609605a50b	Fix #820, extract service for modules. 3.0.21	8 years ago
winlin	b75a3fad4e	For #820, fix ubuntu build failed.	8 years ago
winlin	362b5788cd	For #820, fix warnings	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	62b7204514	Refine code, add mp4 parser module	8 years ago
winlin	c648fd27bf	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”	1b26536253	Add SIP RFC	8 years ago
“winlin”	a48fdd9f03	Add ICE RFC	8 years ago
winlin	ce034c3556	Refine docs, add TURN/STUN rfc.	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	14765c2ba5	For #790, play or publish is not neccessary for bandwidth test.	8 years ago
ME_Kun_Han	3562424ee3	fix bug, add param for generating tc url and add play stream to make-bandwidth checking success (#790)	8 years ago
winlin	8ab43b3e78	Fix #794, refine the comments.	8 years ago
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	8 years ago
winlin	7680ac04ad	Refine srs-librtmp	8 years ago
winlin	1743899a23	Refine code	8 years ago
winlin	16cde27a1e	Remove MacOS compile option, for it's on use. It's caused by paralell make	8 years ago
winlin	121a2e5886	For #110, refine thread object. 3.0.19	8 years ago
winlin	44014683e1	Refine thread.	8 years ago
winlin	5bec6a4fdd	Refine srs-librtmp	8 years ago
winlin	011b693235	Update srs-librtmp, set errno to ret when failed.	8 years ago
winlin	72c4ae4a8c	Refine srs-librtmp API, change print to format	8 years ago
winlin	ad87bd7cf2	Refine configure	8 years ago
winlin	68a5407b3a	Remove using of connect_app2.	8 years ago
winlin	26c20db2b3	Fix parse srs version bug	8 years ago
winlin	c849010fe2	Refine api for srs-librtmp	8 years ago
winlin	af73e8ee65	Add log functions for srs-librtmp	8 years ago
winlin	ca43bfe6d9	Fix build failed, for srs librtmp API changed.	8 years ago
winlin	cdfded6a74	Support disable valgrind	8 years ago
winlin	89a5fa69d1	Refine srs-librtmp, set the schema, rather that connect app3	8 years ago
winlin	4e96c443d8	Change the bool to int for C	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	3903d2a8e3	For #730, remove the test code. 2.0.234	8 years ago
HungMingWu	a6582c6208	Disable openssl thread support to prevent ubuntu linking pthread error	8 years ago
winlin	764cf245e9	For #774, build librtmp exmaples failed for -lpthread	8 years ago
winlin	ac0e27b936	For #774, refine code style	8 years ago
HungMingWu	01d5e4da17	Replace openssl from l-1.0.1f to 1.10e (#774) ... DUe to API breakchange, add a wrapper for backward compatibility	8 years ago
winlin	695ceeab48	Refine code for #777	8 years ago
Chengdong Zhang	a3df4e3bfb	Fix #744 http callback set a wrong default port (#777) ... * Add port verify Code is more robust * Verify port Verify port * Change hard code to defined. Change hard code to defined.	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
HungMingWu	33d6274217	Replace ffmpeg version from 2.1.1 to 3.2.4	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