1799 commits

Author	SHA1	Message	Date
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	2015-01-08 17:48:45 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	6c833902f9	merge http api from tufang. 2.0.92	2015-01-08 16:02:33 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	44f5efda21	refine the print info.	2015-01-07 15:46:00 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	2015-01-07 15:35:01 +08:00
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	2015-01-07 15:01:58 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +08:00
winlin	89a3cf9efe	refine code, failed when specified complex but no ssl for srslibrtmp	2015-01-07 13:37:23 +08:00
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	2015-01-07 13:29:30 +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	97bea51499	refine the api, response the error code and data.	2015-01-05 12:49:00 +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
winlin	67adc8dc61	merge with security bug fix.	2015-01-05 12:09:15 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	2015-01-03 15:08:46 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	7f60d472e6	remove the change vhost forward.	2015-01-03 14:47:19 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	0b9bbdbe74	Merge branch '1.0release' into develop	2015-01-03 13:30:13 +08:00
winlin	f9a33fbeee	fix the compile failed for utest at 32bits cpus	2015-01-03 13:29:52 +08:00
qiang.li	8d534d3470	get stream info use http api #227	2015-01-03 12:57:13 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +08:00
winlin	f89941254a	refine code of security deny check	2015-01-02 16:06:18 +08:00
winlin	18b15b9099	refine comments of security deny check	2015-01-02 16:04:30 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	2015-01-02 12:57:44 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	07b207b7e3	remove test code for api-server.	2015-01-02 10:30:25 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	2015-01-02 09:22:49 +08:00
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	2015-01-02 09:20:45 +08:00
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	2015-01-02 09:05:16 +08:00
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	2015-01-01 11:47:18 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	1824e18bd2	fix the comment bug.	2014-12-31 20:20:32 +08:00
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	2014-12-29 14:24:22 +08:00
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	2014-12-29 09:07:50 +08:00
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	2014-12-29 09:05:56 +08:00
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	2014-12-29 08:45:19 +08:00