47 commits

Author	SHA1	Message	Date
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	6234905532	Refactor ISrsKbpsDelta	2019-01-01 17:36:27 +08:00
winlin	c26b475bae	Refine kbps, stub wall clock	2018-12-23 20:47:17 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	6eae93258a	For #913, APP support complex error.	2018-01-01 19:39:57 +08:00
winlin	c97f2233a2	Merge SRS2 for #851	2017-04-23 21:00:06 +08:00
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	2017-04-23 20:55:51 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	d612a21bad	for #299, refine audio codec object name	2017-02-12 20:46:24 +08:00
winlin	caf69f193d	for #299, refine the codec object name	2017-02-12 20:38:39 +08:00
winlin	136a7ef488	for #299, refine docs.	2017-01-26 17:28:49 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	e0219bd7aa	refine code, merge json encode to amf0.	2015-08-28 14:39:29 +08:00
winlin	555a3fbf5f	for #319, support render HTTP RAW API in console.	2015-08-27 23:55:59 +08:00
winlin	baa70d4ddd	add nb_streams for vhost	2015-08-22 22:51:59 +08:00
winlin	aeebddb269	for #442, add more information for client for api.	2015-08-22 13:57:34 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	b37797b13a	for #442, add publish connection in stream.publish api	2015-08-22 13:03:10 +08:00
winlin	2edcf1d4ff	support query specified vhost	2015-08-21 17:00:52 +08:00
winlin	ab4620870d	refine the stat api, support query specified stream.	2015-08-21 15:51:20 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	c6c90e2643	refine code, add comments for stat on_disconnect.	2015-07-08 17:42:35 +08:00
winlin	d645411392	refine the kbps comments, add one usage.	2015-05-22 20:31:07 +08:00
winlin	7fc1cda392	add stream status to api.	2015-05-08 16:45:25 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	2015-03-08 18:33:35 +08:00
winlin	885b9af122	for #310, refine code to support he/hev2, use aac object.	2015-03-08 17:56:49 +08:00
winlin	d3e2838fc6	for #310, refine the aac profile for adts and aac object for RTMP sequence header.	2015-03-08 17:33:52 +08:00
winlin	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	2015-01-05 13:08:11 +08:00
winlin	ae63af6a4a	refine code, implements the stat.:	2015-01-05 12:57:48 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	40ed2249e8	refine code to use the one coding style.	2015-01-05 12:20:46 +08:00
winlin	4bb17f0c81	replace the TAB with 4spaces	2015-01-05 12:14:02 +08:00
winlin	344ff24f66	add srs_app_statistic to upp project.	2015-01-05 12:12:21 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00