2067 commits

Author	SHA1	Message	Date
wenjie.zhao	643f18abe4	add hds reload supported.#328	2015-03-12 22:38:11 +08:00
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	2015-03-12 11:52:35 +08:00
winlin	5d12a1ab20	for #328, add hds specification.	2015-03-12 11:36:12 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	2015-03-12 07:26:30 +08:00
wenjie.zhao	07d8f060eb	refine annotation	2015-03-11 14:36:28 +08:00
wenjie.zhao	570c0d66bd	fix path issue.	2015-03-11 14:34:00 +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
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	2015-03-11 15:54:31 +08:00
winlin	3e5821efff	enable http api for x86_x64	2015-03-11 15:04:34 +08:00
winlin	3732554844	remove the xcode state.	2015-03-11 14:56:03 +08:00
winlin	1ad0c847ce	fix http parse bug	2015-03-11 14:55:46 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
wenjie.zhao	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +08:00
winlin	5370493140	add ingest to mac.dev conf.	2015-03-11 13:24:14 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	b3aed2cb59	fix the bug of configure.	2015-03-10 18:18:47 +08:00
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	2015-03-10 18:07:43 +08:00
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	2015-03-10 17:58:29 +08:00
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	2015-03-10 17:04:02 +08:00
winlin	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	20fb5f3e8e	modify the colorful bash for osx.	2015-03-09 23:20:12 +08:00
winlin	b0953c1d3a	add comments of audio profile supported by srs.	2015-03-08 20:02:43 +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	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	2015-03-08 17:36:43 +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
winlin	8bf60895a9	refine the kbps of server.	2015-03-08 12:55:40 +08:00
winlin	fbbe46d272	refine the config, support directly parse file.	2015-03-07 22:25:43 +08:00
winlin	b8e70f8538	support module	2015-03-07 16:49:21 +08:00
winlin	ee30e6bb1f	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-03-07 16:39:56 +08:00
winlin	05d238f860	support modules.	2015-03-07 16:39:05 +08:00
winlin	688890cd7a	refine configure, generate objs/makefile first.	2015-03-07 16:37:29 +08:00
winlin	a29b8a7a5b	refine configure, move auto headers to script.	2015-03-07 16:33:06 +08:00
winlin	aaf87cf3d9	add srs module rule.	2015-03-07 16:29:18 +08:00
winlin	b360fe279d	remove libaacplus.	2015-03-06 22:35:02 +08:00
winlin	496f689de7	fix bug for libfdk aac.	2015-03-06 22:29:49 +08:00
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	2015-03-06 13:37:57 +08:00
winlin	1277968d4a	refine http client, use initialize to set host and port.	2015-03-06 12:07:12 +08:00
winlin	2bcb4f811c	refine http.	2015-03-06 11:56:28 +08:00
winlin	964e4be9d4	refine http request post. 2.0.132.	2015-03-06 11:51:20 +08:00
winlin	3982ec1d87	refine http request parse. 2.0.132.	2015-03-06 11:36:26 +08:00
winlin	4325809daf	refine http	2015-03-05 21:45:01 +08:00
winlin	6fccfa061d	refine the http request code.	2015-03-05 10:36:40 +08:00
winlin	025b707330	refine the http request reader.	2015-03-04 18:20:15 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	04dc60ebe1	refine http for srs, rename SrsGoHttp to SrsHttp.	2015-03-04 13:09:35 +08:00
winlin	983ab8fb89	pass all utest for 2.0	2015-03-04 12:24:22 +08:00
winlin	e7fd733dc5	fix the long long warning.	2015-03-04 09:59:40 +08:00
winlin	3d47fbdc5c	fix build failed of utest.	2015-03-04 09:18:15 +08:00
winlin	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	f619f174e6	add readme for ide.	2015-03-03 15:28:18 +08:00
winlin	5d0cb7e68f	update conf for rtsp	2015-03-01 21:24:01 +08:00
winlin	012c29e124	for #133, update the wiki.	2015-03-01 21:08:44 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	8ed256b7e9	for #179, wait keyframe for dvr. 2.0.127	2015-02-27 21:11:29 +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	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	1cb8e44b1b	fix #304, fix hls bug, write pts/dts error. 2.0.124.	2015-02-24 18:39:31 +08:00
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	2015-02-24 17:29:30 +08:00
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	2015-02-23 19:23:32 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	849e59b05d	for #179, support http api to start dvr.	2015-02-21 23:09:21 +08:00
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	2015-02-21 21:17:59 +08:00
winlin	1445086451	for #179, update the metadata of flv dvr file.	2015-02-21 19:14:05 +08:00
winlin	7077b74d03	for #179, add dvr plan append.	2015-02-21 16:52:37 +08:00
winlin	95b4baee7c	for #179, refine dvr code to more simple.	2015-02-21 16:25:04 +08:00
winlin	3d225e1bc7	refine dvr, donot append the flv header.	2015-02-19 20:08:56 +08:00
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	2015-02-19 19:50:10 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	9d233db27e	fix #133, support push rtsp to srs. 2.0.120.	2015-02-18 22:28:39 +08:00
winlin	a954040d29	for #133, rtsp parse aac from rtp packet.	2015-02-18 13:37:08 +08:00
winlin	0cc693a3b8	for #133, decode the h264 NALU from rtp.	2015-02-18 11:49:42 +08:00
winlin	6a64164985	for #133, show more info about rtp.	2015-02-18 07:27:11 +08:00
winlin	45c0b12958	for #133, finish rtsp sdp, start rtp.	2015-02-17 22:20:47 +08:00
winlin	f14af45413	for #133, alloc and free rtp port.	2015-02-17 21:10:06 +08:00
winlin	d4ceff649f	the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.	2015-02-17 21:03:39 +08:00
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	2015-02-17 21:01:44 +08:00
winlin	40fbfd8560	for #133, rtsp extract tcp/udp listener.	2015-02-17 16:28:28 +08:00
winlin	4807f7850d	for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.	2015-02-17 14:16:02 +08:00
winlin	604f4cc57b	for #133, support the rtsp options request and response.	2015-02-16 22:15:59 +08:00
winlin	c0e50265bd	for #133, create rtsp framework.	2015-02-16 14:05:01 +08:00
winlin	e81e090239	for #133, add rtsp listener and handler.	2015-02-15 21:28:31 +08:00
winlin	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	2015-02-15 18:11:24 +08:00
winlin	922150b2cf	for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.	2015-02-15 17:43:35 +08:00
winlin	3c813847bd	rewrite the ts remux of hls. 2.0.117	2015-02-15 16:37:28 +08:00
winlin	1ed3e283ab	implements the pat/pmt write ts header.	2015-02-14 23:06:01 +08:00
winlin	e88c1e32ee	always increasing target duration, for #304	2015-02-14 16:30:04 +08:00
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	2015-02-12 13:34:59 +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	e19ee0cb99	for #311, set pcr_base to dts. 2.0.114.	2015-02-10 23:15:43 +08:00
winlin	87519aaae8	fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114	2015-02-10 22:37:29 +08:00
winlin	66931a8890	try to fix hls problem, print the video packets.	2015-02-10 19:58:24 +08:00
winlin	b8d4f68a69	try to refine hls, always flush video when reap segment.	2015-02-10 19:32:42 +08:00
winlin	5a3cd235fd	refine hls, try to fix the hls ts corrupt problem.	2015-02-10 19:09:31 +08:00