1036 Commits (efc9f53512371f9f054a6c11030e131001fc6a81)

Author	SHA1	Message	Date
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
winlin	51c1615173	change to 0.9.42, add http parse framework	11 years ago
winlin	5aa0043934	add rfc822 for http1.1	11 years ago
winlin	b0d77c4697	move wiki images to srs.release	11 years ago
winlin	c7a4dd8863	move wiki images to srs.release	11 years ago
winlin	27029679e9	donot ensure transaction-id===1 for connect req/res, change to 0.9.41	11 years ago
winlin	e3254377ce	update depends, allow pi/dev to enable gprof/gperf	11 years ago
winlin	64a8dfb09a	refine rtmp send protocol, use the same cache for header	11 years ago
winlin	4dfbbcdff4	force st to use epoll, change to 0.9.39	11 years ago
winlin	234ce08ed3	force st to use epoll	11 years ago
winlin	b8f6ef59c5	update readme, refine the chinese summary	11 years ago
winlin	b95e1cab30	update readme, refine the title	11 years ago
winlin	17739e459b	update readme, add csdn mirror	11 years ago
winlin	104c143dbe	add csdn auto sync script	11 years ago
winlin	c6cdc4ad54	refine package for raspberry.	11 years ago
winlin	be8aa92ab0	refine package for raspberry.	11 years ago
winlin	37fe08a302	support debian and raspbian	11 years ago
winlin	3932cf1334	update build, always patch st, for we need to build in raspberrypi directly	11 years ago
winlin	917f1ea9e1	fix bug of typo of readme. update package to support --help and options	11 years ago
winlin	41f5217360	refine http code, define CRLF consts for http	11 years ago
winlin	6913efe127	implements the http api/stream framework	11 years ago
winlin	ab3c6c92a0	rename srs-client to srs-rtmp-conn	11 years ago
winlin	aa89f9f51e	change to 0.9.37, for http api/stream	11 years ago
winlin	041a07dfda	add http config in srs conf	11 years ago
winlin	4c8d6d2eb1	fix bug of hls and rename demo player stream to live/demo. change to 0.9.36	11 years ago
winlin	ea3561de08	change script log dir to objs	11 years ago
winlin	97435c6bb4	fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir	11 years ago
winlin	0858bd8b6f	Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35	11 years ago
winlin	ebf1139582	fix the forward loop detect bug. change to 0.9.34	11 years ago
winlin	e02293d94d	fix bug of handshake with nginx-rtmp for forward, change to 0.9.33	11 years ago
winlin	1386e7a8ab	fix bug of handshake with nginx, simple hs	11 years ago
winlin	e56c52ceba	change to 0.9.32	11 years ago
winlin	7b3bc8f741	fix bug of bwtc	11 years ago
winlin	644dfa1a6d	fix bug of librtmp	11 years ago
winlin	a9d11df3a3	update arm tool chain	11 years ago
winlin	a6d9da5e43	fix bug of script, support both abs and relative path	11 years ago
winlin	c3e750e90f	add version to log	11 years ago
winlin	bcb54e6587	fix bug of package arm	11 years ago
winlin	4992a9979a	add package arm	11 years ago
winlin	7431c110fe	package support arm package	11 years ago
winlin	0e54967fb8	fix bug of package, use uname hardware platform	11 years ago
winlin	3035e2b46a	refine package, add os machine	11 years ago
winlin	494894a846	remove dev.sh	11 years ago
winlin	ade3630fa6	add package and install script	11 years ago
winlin	34efa15118	change to 0.9.30, first release for srs1	11 years ago
winlin	9055d8eecf	update readme.	11 years ago
winlin	cb1499fcb6	change log strategy, write log to file. change to 0.9.29	11 years ago
winlin	ed20bd7078	default write log to file.	11 years ago
winlin	76290a5a12	fix bug of get daemon	11 years ago
winlin	7930add7f9	add log tank config, default to console.	11 years ago
winlin	b290a00de7	refine log	11 years ago
winlin	d9104f3b5e	fix bug of make file	11 years ago
winlin	f1477dc4fe	support daemon, default start in daemon. change to 0.9.28	11 years ago
winlin	3ec3c1f532	support daemon	11 years ago
winlin	2c1354b9b9	fix bug of log message	11 years ago
winlin	56679b3c82	add srs_log_file to write log to file. change to 0.9.27	11 years ago
winlin	d94b9f44b3	add srs_log_file to write log to file. change to 0.9.27	11 years ago
winlin	4ddb5256ac	fix bug of init.d script	11 years ago
winlin	2e1aed5403	rename init.d script to srs and srs-api	11 years ago
winlin	29fe53e21b	fix bug of build cherrypy	11 years ago
winlin	73f1762122	fix bug of build cherrypy	11 years ago
winlin	f3e4c16a2f	copy ffmpeg when install-demo	11 years ago
winlin	22603b7465	add api-server init.d script	11 years ago
winlin	d63cbb3c46	add reload support. add make install and uninstall, change to 0.9.26	11 years ago
winlin	62762cf1ad	add reload support. add make install and uninstall	11 years ago
winlin	3c5878c980	rename ./etc/init.d/srs to ./etc/init.d/simple-rtmp-server	11 years ago
winlin	3c920b933c	add ./etc/init.d/srs, refine configure to support make clean then make.	11 years ago
winlin	fdad7c25f0	fix isse #35: the gettimeofday jitter, log warn message	11 years ago
winlin	4f284b20f0	drop ts segment when duration is too small	11 years ago
winlin	5758551508	support hls republish	11 years ago
winlin	f25c6558a5	write pid to ./objs/srs.pid.	11 years ago
winlin	0686b8fa5a	update readme, add product wiki link	11 years ago
winlin	a0c0c94cf0	refine conf, add comments for other listen type	11 years ago
winlin	2cebaff9d8	refine hls, ts temp file use ext .tmp	11 years ago
winlin	dbf642723f	update readme, add hls(audio-only) support to readme. update sample flv from h264+mp3 to h264+aac	11 years ago
winlin	8600c0ebe9	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	11 years ago
winlin	e0fb1029c9	support pure audio hls. change to 0.9.24	11 years ago
winlin	b708f588fc	refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable.	11 years ago
winlin	2036cef43b	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	11 years ago
winlin	ef7853d7f7	fix demo bug, remove the api server static-dir when link to nginx	11 years ago
winlin	6bc18f2e44	fix script generate auto header bug, always create file	11 years ago
winlin	8239174e97	update configure, change to 0.9.23	11 years ago
winlin	238349b0c0	update configure, change to 0.9.23	11 years ago
winlin	6374fa1383	simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof	11 years ago
winlin	c63ad48893	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	11 years ago
winlin	822143b500	fix bug of build script	11 years ago
winlin	a2c5075002	update comments for handshake.	11 years ago
winlin	a470330383	finish utest for handshake.	11 years ago
winlin	6b84a5e14c	change to 0.9.22	11 years ago
winlin	b7d40b5aba	support vn/an to disable video/audio, for radio streaming	11 years ago
winlin	747bbd988e	change to 0.9.21, refine complex handshake, client/server support complex handshake.	11 years ago
winlin	da93b6fe99	add complex handshake utest	11 years ago
winlin	491ea4b630	support client complex handshake with server	11 years ago
winlin	841f0f8899	change to 0.9.19, verify the s1/s2/c2, refine the handshake.	11 years ago
winlin	152d3539d8	add s1 validation for client/server	11 years ago
winlin	12445174e7	add option --static, to static link for arm	11 years ago
winlin	efa22074be	always use static link, for manually build arm, and x86/64 use static link is ok.	11 years ago
winlin	e0e451b680	add utest support for arm	11 years ago
winlin	d89d16ca1e	print the system info when startup main	11 years ago
winlin	2eeb289c2f	assert system is little-endian	11 years ago
winlin	b58ab508f9	add rtmp handshake utest, for arm to finger out the bug	11 years ago
winlin	1c055e7424	add log for ssl disabled.	11 years ago
winlin	1ffbdbc098	refine log, donot show error when client gracefully close it	11 years ago
winlin	b52a051d80	refine readme, confs	11 years ago
winlin	a0b747621e	update srs.conf, add comments to see full.conf	11 years ago
winlin	b36338853a	refine the conf files, rename srs.conf to demo.conf	11 years ago
winlin	d67edf631b	update readme, add ubuntu12 to test list	11 years ago
winlin	c85dde7f3f	substitute all TAB with 4spaces.	11 years ago
winlin	e5770b10b1	refine the colorful log for srs. remove the log when client close.	11 years ago
winlin	8029b7464a	Merge pull request #28 from wenjiegit/master ... merge from wenjie.zhao for colorful log.	11 years ago
winlin	618f6f52ae	fix bug of librtmp sample on x86/x64 platform	11 years ago
winlin	1a3142d23b	fix bug of librtmp sample build for arm, use static link	11 years ago
winlin	618579e484	refine srs build for arm, support librtmp sample	11 years ago
winlin	a29bd05c0f	refine build script	11 years ago
winlin	71adff776b	fix build script, remove unused build tool defines	11 years ago
winlin	77e652fcbe	refine buils nginx script	11 years ago
winlin	421fbd4c3e	fix bug of arm build script__SRS_BUILD_NGINX=NO	11 years ago
winlin	3721e72e99	arm: change to 0.9.18	11 years ago
winlin	5a4373d483	Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp.	11 years ago
winlin	ad05eec7a2	arm support librtmp	11 years ago
winlin	a9da5903f6	arm support ssl/hls, change to 0.9.17	11 years ago
winlin	75340e3ac0	add refer for arm research code	11 years ago
winlin	7744053d28	add arm research files, change to 0.9.16	11 years ago
winlin	a90cb9dd84	fix ubuntu build warning, the config unused setter	11 years ago
winlin	010b5c0d7a	fix ubuntu build warning, the config unused setter	11 years ago
winlin	04cc29f4e1	support ubuntu make colorful display	11 years ago
wenjie.zhao	109ce07c1b	color text of error msg supported. ... strerror msg supported.	11 years ago