3003 Commits (bbbc40f9c2a3992311d83e4431bb5c676f4f30be)

Author	SHA1	Message	Date
winlin	d919668b61	don't ignore aud	9 years ago
winlin	bf22acd689	Merge branch '2.0release' into develop	9 years ago
winlin	a4bb03b9d6	ignore other 264 frame except sps,pps,idr,nonidr	9 years ago
winlin	31a1b7bed2	Merge branch '2.0release' into develop	9 years ago
winlin	304ff02aef	default to 30s timeout for librtmp	9 years ago
winlin	d68a459198	Merge branch '2.0release' into develop	9 years ago
winlin	02fb0779be	fix the microsec calc bug for librtmp	9 years ago
winlin	14760003ba	merge from 2.0	9 years ago
winlin	e00928557e	fix the timeout for librtmp	9 years ago
winlin	516f33888c	refine config	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	f87646d489	fix typo of config.	9 years ago
winlin	abeb4f46a9	merge 2.0	9 years ago
winlin	ec6e77992e	2.0.210	9 years ago
winlin	499fc07db1	refine the hls m3u8 refresh interval.	9 years ago
winlin	5fa500646e	update srs player version	9 years ago
winlin	ec57e2170d	refine hls m3u8 refresh interval and buffer time	9 years ago
winlin	b463e4a2f4	Merge branch '2.0release' into develop	9 years ago
weiyabo	8df7135dee	for bug #5064, success parse 264 sps	9 years ago
winlin	c746753c6a	update player, add pst(player startup time)	9 years ago
winlin	892591f9a6	merge from @mbeacom	9 years ago
winlin	2e75c9f45f	add more buffer	9 years ago
winlin	9312d77c20	default not to preview the stream for publisher.	9 years ago
winlin	6b5c880ff9	refine player to support status change.	9 years ago
winlin	4841435b14	fix default http port bug.	9 years ago
winlin	a2d235f015	refresh js cache.	9 years ago
winlin	d7a28059ed	remove jwplayer and osmf	9 years ago
winlin	d9f1ced732	change srs player to 1.28	9 years ago
winlin	77167f3331	refine srs player for hls, extract a HlsNetStream.	9 years ago
winlin	2492562d25	use xpsid X-Playback-Session-Id to more useful.	9 years ago
winlin	b2bd63e833	refine srs player to play hls.	9 years ago
winlin	46a31f4884	support play hls	9 years ago
winlin	69ec66ee36	refine js for player.	9 years ago
winlin	0a2e00f8c5	dump logs	9 years ago
winlin	9ab5039b36	extract iplayer for srs-player.	9 years ago
winlin	10ce961a00	update version for bwtc	9 years ago
winlin	b3c13f2550	refine the bwtc, to compatible with bms4.	9 years ago
winlin	eed4626c35	use larger limit	9 years ago
winlin	a3038b1274	fix the rtmp url parse bug.	9 years ago
winlin	82aa9d120c	for #5114, display metadata.	9 years ago
winlin	a8ee3162d4	Merge branch '2.0release' into develop	9 years ago
winlin	d72b93e58b	fix the sed bug, to compatible with osx	9 years ago
winlin	00c60db7c3	Merge branch '2.0release' into develop	9 years ago
winlin	f7d9ed5ae4	update api	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	0cd15068de	set default buffer time to 0.5 for srs player.	9 years ago
winlin	f8358da316	refine ingester log.	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	e2e6e76f92	for #558 and #559, 2.0.208	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
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	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
winlin	26211abf2e	refine code.	9 years ago
winlin	f516636448	refine code for hooks and http core.	9 years ago
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	9 years ago
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	9 years ago
winlin	190db75835	refine code for nx_json modify the data when loads.	9 years ago
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	9 years ago
winlin	7ae2c6bf50	merge from srs2.	9 years ago
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	9 years ago
winlin	11e11005ac	specifies the try default vhost	9 years ago
winlin	d267b8fa19	fix bug for create connection with ip.	9 years ago
winlin	a7bf4bfda5	refine code, ignore client when no ip.	9 years ago
winlin	49308dddfb	update 2015 to 2016	9 years ago
winlin	d0c74fa7cd	update 2015 to 2016	9 years ago
winlin	714c13d88d	merge from srs2	9 years ago
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	9 years ago
winlin	65b81a4e68	merge from srs2	9 years ago
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	9 years ago
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	9 years ago
winlin	b881166f9a	merge from srs2	9 years ago
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	9 years ago
winlin	5f915aa959	merge from srs2	9 years ago
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	9 years ago
winlin	e124aeb614	Merge branch '2.0release' into develop	9 years ago
winlin	69d191e53f	refine the hls error log.	9 years ago
winlin	0ab64ccd2a	merge from srs2.	9 years ago
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	9 years ago
winlin	f6ff116505	refine code, persistence use isolate method.	9 years ago
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	9 years ago
winlin	26d328e7f2	fix bug for api, level should be string.	9 years ago
winlin	ffef3905af	merge from srs2.	9 years ago
winlin	5660e24953	fast stop server.	9 years ago
winlin	2830ee12c1	fix the on_hls.ts_url bug.	9 years ago
winlin	1e4c8f8bf3	fast stop server.	9 years ago
winlin	3ab5892863	refine comments.	9 years ago
winlin	5ac8177ce6	fix bugs	9 years ago
winlin	fabcc91a0e	refine codes.	9 years ago
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	9 years ago
winlin	fba1122835	private the srs_vhost_resolve	9 years ago
winlin	17bb31cab1	fix the config bug.	9 years ago
winlin	eec2c34b5c	refine publisher.	9 years ago
winlin	cfe230438a	revert test code	9 years ago
winlin	6191e0af90	s1 compute key.	9 years ago
winlin	18eb8c81b3	merge from srs2	9 years ago
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	9 years ago
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	9 years ago
winlin	c77cefb6fa	refine the position of log script	9 years ago
winlin	44b26271bf	Merge branch '2.0release' into develop	9 years ago
winlin	c4c63f7825	fix build failed bug for osx.	9 years ago
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	9 years ago
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	9 years ago
winlin	6c7a51d310	Merge branch '2.0release' into develop	9 years ago
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	9 years ago
winlin	d2ccc4f661	Merge branch '2.0release' into develop	9 years ago
winlin	8c04b17d08	use /usr/local/bin for osx.	9 years ago
winlin	7db7d43aea	Merge branch '2.0release' into develop	9 years ago
winlin	18b50d961f	support query server by id.	9 years ago
winlin	aca9fe805c	Merge branch '2.0release' into develop	9 years ago
winlin	d916c53702	refine the api server.	9 years ago
winlin	a89ed68aa3	update readme for #511.	9 years ago
winlin	75be18133d	fix build failed for utest.	9 years ago
winlin	6df4d1f05a	merge from srs2.	9 years ago
winlin	98e25def6c	fix utest build failed for osx.	9 years ago
winlin	97f5bb8b99	merge from srs2	9 years ago
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	9 years ago
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	9 years ago
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	9 years ago
winlin	4b5eb5ea2d	fix the parse rtmp url bug for ingest.	9 years ago
winlin	ec225b2108	quit child process when fork failed.	9 years ago
winlin	9d7826c681	quit child process when fork failed.	9 years ago
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	9 years ago
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	9 years ago
winlin	604486b0a3	for #515, use srs_freepa to free array.	9 years ago
winlin	8cec06e898	merge srs2, use srs_freepa for array	9 years ago
winlin	2af7749771	for #515, use srs_freepa to free the array.	9 years ago
winlin	cef1ae5a8e	fix the config bug.	10 years ago