1062 Commits (df2e8f16b7fbec1fb6124e2388eedd3a744ab1d9)

Author	SHA1	Message	Date
winlin	7ff8df4d97	refine code, notice api when segment close	11 years ago
winlin	09901d31da	fix bug of android api server, fix the dead loop	11 years ago
winlin	580cbb84a9	add threading.Lock for cherrypy, or performance suffer.	11 years ago
winlin	435e02db5d	dvr use .tmp and rename to .flv when finished.	11 years ago
winlin	733ca2475d	call http api when dvr got keyframe	11 years ago
winlin	36d8fdfc1a	move the ts buffer to http message	11 years ago
winlin	a73bf8d4aa	optimizm the http server for send ts file	11 years ago
winlin	1af2c9bcc9	update script add librtmp for arm for tools flv/rtmp ingester	11 years ago
winlin	6f984ff54b	fix bug of raspberry-pi build, static off	11 years ago
winlin	a158d81085	update raspberry-pi demo api	11 years ago
winlin	b5b5202ed2	update cdn api server.	11 years ago
winlin	b85e667991	update api, select the lowest load of peer	11 years ago
winlin	87bdaa21c9	add nodes for api	11 years ago
winlin	dcb9941ed7	add hls api to api-server	11 years ago
winlin	8bf1f4ad87	add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72	11 years ago
winlin	a5f4f6bd14	add meminfo	11 years ago
winlin	15aea4d9b3	add cpuinfo	11 years ago
winlin	951a93ab86	get self proc and system proc stat	11 years ago
winlin	117fd67950	add cpu stat	11 years ago
winlin	4c5aae7804	fix bug of ingest for android, init the variable to 0	11 years ago
winlin	5c8aad4fe4	fix bug of ingest for android, init the variable to 0	11 years ago
winlin	c530a8e5fc	fix bug of ingest for android, init the variable to 0	11 years ago
winlin	e0e033d847	fix bug for arm cross build	11 years ago
winlin	e42eef422f	add ssl and nossl for ingest flv/rtmp over srs-librtmp	11 years ago
winlin	e5fcf80b94	refine ingest flv over srs-librtmp	11 years ago
winlin	fae1c61c3f	update readme. change to 0.9.71	11 years ago
winlin	b1835ee2fe	add ingest flv to RTMP over srs-librtmp	11 years ago
winlin	f17f5de7d1	ingest rtmp to rtmp by srs-librtmp	11 years ago
winlin	608b28f223	add srs ingest flv/rtmp base on srs-librtmp	11 years ago
winlin	d013801c26	add configure options --disable-all	11 years ago
winlin	6b76e9e665	update test configure script	11 years ago
winlin	25630b5211	fix bug of utest build.	11 years ago
winlin	8651f38b59	update test configure script	11 years ago
winlin	443b9c48f4	update script	11 years ago
winlin	03af43017d	update dvr config comments	11 years ago
winlin	67ddc9f5ae	support dvr(record live to flv file for vod), change to 0.9.70	11 years ago
winlin	ab9a2ddd6c	dvr support segment plan	11 years ago
winlin	2d1c28cff9	update dvr, support segment plan	11 years ago
winlin	6f19a83114	dvr support plan and default session plan	11 years ago
winlin	4b82a4f510	support reload dvr	11 years ago
winlin	9861fc4fe3	refine dvr, add comments	11 years ago
winlin	56ff70cdf8	remove lseek and size of fs stream	11 years ago
winlin	271b969d0b	set audio/video flag to 0 in flv header.	11 years ago
winlin	73459547e1	support dvr. change to 0.9.69	11 years ago
winlin	996d042a33	add comments for file stream	11 years ago
winlin	a63fa20e53	extract flv format from f4v/flv specification	11 years ago
winlin	9ef7a83415	update server, add rtmp pc url	11 years ago
winlin	f5ff9c7241	update dvr comments	11 years ago
winlin	fdd0678bcb	add thread cid to log	11 years ago
winlin	28231cadda	add transcode for demo meeting hls.	11 years ago
winlin	ae3f7d9cb8	change meeting hls to an	11 years ago
winlin	5af1da17ed	change to 0.9.68	11 years ago
winlin	0c91fa6bed	fix dvr mem leak, free msg when not use it.	11 years ago
winlin	36c2c37b42	add srs.test for configure test and utest.	11 years ago
winlin	7a66dd8186	update test scripts.	11 years ago
winlin	f0a2fe235f	refine scripts, use configure presets.	11 years ago
winlin	88094af97a	refine log, add user original configure	11 years ago
winlin	78e7a31ddb	refine option, add --use-sys-ssl, change to 0.9.67	11 years ago
winlin	406a30e533	add configure preset, add test for configure	11 years ago
winlin	47927ab460	refine options, change to 0.9.66	11 years ago
winlin	cc338fdb7c	fix bug for default configure	11 years ago
winlin	005502a07e	update comments for HLS on_hls_start	11 years ago
winlin	642fc19f9d	update api server demo	11 years ago
winlin	fd0002e499	add dvr framework	11 years ago
winlin	96115ac4f7	fix bug of config params. x86/x64/pi never use static	11 years ago
winlin	90dee0924d	fix bug of build script	11 years ago
winlin	23a1b29935	add dvr option. refine macros of auto headers	11 years ago
winlin	1ae9178605	add favicon.ico, change to 0.9.65	11 years ago
winlin	b1877db405	fix typo of full.conf. fix api server bug	11 years ago
winlin	b86c83b0e0	refine the info for log to file.	11 years ago
winlin	ce64dafc3c	use stream time for live duration. change to 0.9.64	11 years ago
winlin	2c6b6c6846	fix bug #47: use stream time to stop for duration of rtmpdump	11 years ago
winlin	bcfe82f88f	update options for configure help	11 years ago
winlin	73c310cd2e	refine the macro.	11 years ago
winlin	bc756d6ad9	fix simple handshake bug #46, copy c1 to s2. change to 0.9.63	11 years ago
winlin	9a036958d7	fix bug #45, support duration for live. change to 0.9.62	11 years ago
winlin	04a526b340	change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE	11 years ago
winlin	a0472f256d	support test config file. change to 0.9.61	11 years ago
winlin	f980340e89	refine config option	11 years ago
winlin	aa784377fd	refine reload, ignore if parse config file failed.	11 years ago
winlin	cfee761899	support full reload. change to 0.9.60	11 years ago
winlin	bb87272c39	refine reload, rename some vhost specified to add vhost prefix	11 years ago
winlin	dc3c3cff8e	support reload http_stream	11 years ago
winlin	c33ff4fdb8	support reload http_api	11 years ago
winlin	17ac29d160	refine code for reload http api/stream	11 years ago
winlin	821b58af03	support reload atc	11 years ago
winlin	eda1ddc03d	support reload log level/logfile/tank	11 years ago
winlin	f652c28485	support reload pid.	11 years ago
winlin	0a016e58bf	add comments for main	11 years ago
winlin	b38df9cd1a	refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59	11 years ago
winlin	7c64a893f5	add demo.m3u8 and demo.html	11 years ago
winlin	9eb76cb1eb	update demo.conf	11 years ago
winlin	189da7e12e	fix bug of demo.conf	11 years ago
winlin	15f651bccd	update demo, support acodec	11 years ago
winlin	acdd5a827e	update api server, support servers	11 years ago
winlin	ff90278048	add speex1.2 to transcode flash encoder stream. change to 0.9.58	11 years ago
winlin	64727ce616	add bandwidth test conf	11 years ago
winlin	3a26b23fba	change ffmpeg log to ./objs	11 years ago
winlin	ca02cfe1bf	update server.py	11 years ago
winlin	c3c2767363	update api server, add servers	11 years ago
winlin	8295169e0e	refine code, unify the coding style	11 years ago
winlin	ccba9ba9ba	move log level parse to app utility	11 years ago
winlin	f2f30dcc52	add utility, change log to trace	11 years ago
winlin	94874e77af	refine reload config	11 years ago
winlin	6c5d8b4851	refine reload config	11 years ago
winlin	bc61b1de18	fix bug of reload ingest	11 years ago
winlin	e0a6fe63cc	fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57	11 years ago
winlin	9ed3421586	rename from get_ingest to get_ingest_by_id of config	11 years ago
winlin	e432fe931f	support reload ingesters(added/removed/updated). change to 0.9.57.	11 years ago
winlin	e6d8bc1e5c	ingest reload: support disable vhost	11 years ago
winlin	5e504944dc	add comments for http conn	11 years ago
winlin	dc71eef394	support ingest reload: add new vhost with ingester	11 years ago
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	11 years ago
winlin	017b96f9b5	fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	11 years ago
winlin	056895a978	add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	11 years ago
winlin	9372a7065a	refine the ingest log	11 years ago
winlin	4af7b6e383	update conf file, add id for ingest.	11 years ago
winlin	5a3b59d3c8	update conf file, add id for ingest.	11 years ago
winlin	ccf0a423be	change sleep time from 3s to 0.6s for ingester.	11 years ago
winlin	509504f27d	change sleep time from 3s to 0.6s	11 years ago
winlin	5aded78272	change to 0.9.56, for macro changed	11 years ago
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	11 years ago
winlin	70e73bc281	add comments for bug #39	11 years ago
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	11 years ago
winlin	3b59a6c687	fix bug of package for arm	11 years ago
winlin	667191913b	fix bug of package for arm	11 years ago
winlin	5c9941989e	fix bug of package for arm	11 years ago
winlin	503fb93d4e	fix bug of package for arm	11 years ago
winlin	5fd582cd26	fix bug of package for arm	11 years ago
winlin	a8c5db3fc7	fix bug of package for arm	11 years ago
winlin	6e88634c5c	add transcode to package	11 years ago
winlin	9a8eeb685d	update package, add http server and api.	11 years ago
winlin	98809862f7	change to 0.9.55, for 1.0 mainline	11 years ago
winlin	12ba02238d	update readme, add ingest	11 years ago
winlin	05e22e9530	fix script run/build/stop bug	11 years ago
winlin	c11e266d5c	update readme	11 years ago
winlin	3d073f9ef6	update demo script, remove ffmpeg publish. use ingest instead	11 years ago
winlin	4f445f2f60	support ingest stream	11 years ago
winlin	45d8f4346f	implements ingest, change to 0.9.53	11 years ago
winlin	e89ab84e4e	implements ingest, change to 0.9.53	11 years ago
winlin	2742679354	implements the ingest framework	11 years ago
winlin	92281548b6	add ingest config	11 years ago
winlin	9107831b0e	add config to read ingesters	11 years ago
winlin	f5c4f492da	add comments for ffmpeg	11 years ago
winlin	c759a7c6b5	refine log of ffmpeg	11 years ago
winlin	4f7cfeed37	change to 0.9.52, refine encoder and ffmpeg	11 years ago
winlin	72c330d47c	refine ffmepg and encoder, extract ffmpeg.	11 years ago
winlin	095364a72b	refine ingest, start/stop ingest in server	11 years ago
winlin	eea2310b07	refine consts	11 years ago
winlin	4a7378b77a	ingest stream when server cycle	11 years ago
winlin	adfbbbfd68	add ingest files	11 years ago
winlin	7384ad0caa	add ingest config section of full.conf	11 years ago
winlin	5e6c490ba0	add ingest compile feature	11 years ago
winlin	e80abac4f0	add ingest feature to readme	11 years ago
winlin	983fe46ce2	use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding	11 years ago
winlin	5ff1d589f7	change warn to trace for nginx disabled	11 years ago
winlin	d546f815df	update build/run/stop script	11 years ago
winlin	c4524484e6	add comments for aac encoder	11 years ago
winlin	7916cab50e	donot check the aac encoder, ensure aac is ok	11 years ago
winlin	7de8bd7595	allow pi to use ffmpeg	11 years ago
winlin	2949c751f6	update install, create http root	11 years ago
winlin	43979f7505	add htt.hls sample	11 years ago
winlin	30e3323fe4	update readme, add SampleHTTP link	11 years ago
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	11 years ago
winlin	1c02f4551c	always use 64bits for lseek	11 years ago
winlin	ced050829e	fix bug of http, change to 0.9.50	11 years ago
winlin	c5d3b11a6e	update http stream. change to 0.9.49	11 years ago
winlin	3c63cf0a86	update demo page, change http port to 8080	11 years ago
winlin	17ce21348d	implements the http stream module. change to 0.9.49	11 years ago
winlin	ef26e77560	implements the http stream module.	11 years ago
winlin	00eda0d7b2	implements the http stream module.	11 years ago
winlin	83f35d10b1	add http delivery framework	11 years ago
winlin	8d7877ebd1	refine config, group by sections.	11 years ago
winlin	b7093246e4	fix forward conf file bug, change pid file. change to 0.9.48	11 years ago
winlin	28b0c3a27f	refine log and thread function name. change to 0.9.47.	11 years ago
winlin	6d32ad1828	refine log and thread function name	11 years ago
winlin	1117f78587	support arm build for http api and server	11 years ago
winlin	f089eafd9f	fix bug #38, remove app slash of jwplayer, change to 0.9.46	11 years ago
winlin	3f13726544	add log level in conf. change to 0.9.45	11 years ago
winlin	4984631cd6	refine the http crossdomain, send it only required	11 years ago
winlin	133a6f0dbf	add crossdomain support for http error	11 years ago
winlin	b71eb0d49a	support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44	11 years ago
winlin	f2216691f9	remove the duplicated http status line when error	11 years ago
winlin	818c1f1520	support http error code, check url	11 years ago
winlin	0ae23d7556	rename version to versions	11 years ago
winlin	4a40075f68	add contributors to api/v1/authors	11 years ago
winlin	5c019c7938	implements api/v1/version, change to 0.9.43	11 years ago
winlin	9c3ba680d8	fix http hooks json encode bug, remove the JFIELD_CONT for the last field	11 years ago
winlin	a14267d2b4	refine the http url handler match. refine json encode	11 years ago
winlin	bfa07465f0	implements basic http response framework	11 years ago
winlin	341b5151d9	create http handler framework	11 years ago
winlin	eae9b94153	add api framework code	11 years ago
winlin	0ba0c14fb8	refine code, donot listen if not enabled http	11 years ago
winlin	ec6d696565	refine http framework, use http message	11 years ago
winlin	e70609cea3	refine code, extract http hooks.	11 years ago
winlin	5bbb76a59d	remove the namespace srs, use http prefix	11 years ago
winlin	1922d62ff7	add --with-http-api option	11 years ago
winlin	52263457bf	fix bug of no http-server feature	11 years ago
winlin	d28458d5fa	fix script build bug	11 years ago
winlin	6ca9b774c1	support http methods, support js crossdomain request	11 years ago