249 commits

Author	SHA1	Message	Date
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	e124aeb614	Merge branch '2.0release' into develop	2015-12-15 16:25:27 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +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	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	e9e202dbf1	merge srs2	2015-10-28 11:51:32 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	2015-09-14 15:49:25 +08:00
winlin	44bcb4045f	for #474, decode the sequence header before hls.	2015-09-14 15:32:09 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	6bd05f9cfc	for #319, refine the config forward.	2015-08-30 07:59:25 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	cdde293785	add todo for reload the source components.	2015-08-25 22:59:17 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +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	c75f05c88b	fix the log cid display error, merge the publish recv thread log to publish connection.	2015-08-21 15:22:40 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	de48b477ae	drop the metadata when drop sequence header	2015-08-19 14:23:12 +08:00
winlin	f691dddc1a	drop metadata when drop sequence header. support PCUC 0x1a	2015-08-19 14:20:31 +08:00
winlin	afd05f71c3	refine code, use size cache for performance issue.	2015-08-14 15:51:02 +08:00
winlin	3b0b2e0b85	fix the bug to support dump packets with count.	2015-08-14 15:47:29 +08:00
winlin	a0a89a8ca6	use reduce_sequence_header for stream control.	2015-08-14 14:35:41 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	f28c9b7eb5	merge from 2.0release	2015-08-11 15:49:48 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	fbcc07d85a	fix the typo of AUTIO.	2015-08-05 22:54:29 +08:00
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	2015-07-16 11:36:14 +08:00
winlin	9743e02541	refine the mix correct algorithm.	2015-07-14 11:28:00 +08:00
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	2015-07-09 15:45:55 +08:00
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
zhengfl	db9ea4e66e	rewrite #438	2015-07-08 17:08:29 +08:00
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	2015-07-08 15:43:09 +08:00
winlin	f39faa78bb	refine config default values of srs, prepare to move each default values to functions.	2015-07-06 11:11:59 +08:00
winlin	17c276113e	refine the hls dispose, when not cycle always dispose it.	2015-06-13 17:23:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	6941f2c072	fix #424, fix aggregate timestamp bug. 2.0.174	2015-06-10 13:53:13 +08:00
winlin	8e8c8108fc	refine the time jitter code.	2015-06-09 21:04:30 +08:00
winlin	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	2015-06-09 14:38:05 +08:00
winlin	573495a19f	refine the memory watcher.	2015-06-08 09:47:45 +08:00
winlin	811ef4bcf6	dispose the gop cache	2015-06-07 09:27:47 +08:00
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	2015-06-06 22:04:24 +08:00
winlin	2d9f258eaf	refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.	2015-06-06 21:54:43 +08:00
winlin	a6dd8fb3a1	fix #421, when mix correct on, must check the type of dequeue msg.	2015-06-06 21:31:39 +08:00
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	2015-06-06 21:23:57 +08:00
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	2015-06-06 20:23:18 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	2015-05-27 16:16:15 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +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	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00
wenjie.zhao	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +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	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	381e88d698	add release code. ZhouGuowen for SRS2.0	2015-02-11 08:52:52 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	2015-01-31 21:16:42 +08:00
winlin	2c42350489	for #301, http ts stream support h.264+mp3. 2.0.106	2015-01-25 16:42:22 +08:00
winlin	f9d1e1111a	merge from feilong, consumer directly sleep when paused.	2015-01-23 17:07:17 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	913f98b902	for bug #293, http ts stream, move the avc codec from app to kernel.	2015-01-22 17:08:38 +08:00
winlin	29a8932b49	for bug #293, use http stream cache for android weixin to happy.	2015-01-19 12:56:05 +08:00
winlin	f9f2fcbb9c	for #293, add http stream cache for audio mp3/aac stream.	2015-01-19 12:24:18 +08:00
winlin	2698e6dbae	for bug #293, http live streaming framework.	2015-01-18 18:39:53 +08:00
winlin	29be14dd37	merge from feilong, fix memory leak.	2015-01-17 11:16:13 +08:00
winlin	a4b61081cc	merge from feilong, fix memory leak.	2015-01-15 11:26:30 +08:00
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	2015-01-08 17:48:45 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
qiang.li	8d534d3470	get stream info use http api #227	2015-01-03 12:57:13 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00