4194 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ziyue	f5a032c9a0	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-11-01 14:08:36 +08:00
cqm	dde352542b	private FrameWriterInterfaceHelper	2022-11-01 12:03:49 +08:00
cqm	ac3d7bd21f	add addDelegate with std::function, remove FrameWriterInterfaceHelper	2022-11-01 12:03:04 +08:00
ziyue	520945c2e9	提高线程安全性	2022-11-01 10:53:38 +08:00
xiongguangjie	d2c64b1f09	Merge remote-tracking branch 'origin/master'	2022-10-31 19:04:04 +08:00
xiongguangjie	613aae8bc3	rtp server only tcp mode is none use udp server	2022-10-31 18:47:42 +08:00
ziyue	918b1fce6c	修复hls/ts拉流崩溃问题：#2057	2022-10-30 23:50:20 +08:00
xiongziliang	9498b96b95	确保rtp推流线程安全性	2022-10-30 21:36:35 +08:00
xiongziliang	80eb6dc402	协议解析最大支持4MB分包: #2026	2022-10-29 22:57:32 +08:00
xiongziliang	c25e93fee3	解决启动ffmpeg进程导致shell终端假死的问题：#1662	2022-10-29 17:44:55 +08:00
xiongziliang	9bb4b55924	修复mk_media_start_send_rtp相关bug: #2044	2022-10-29 16:48:37 +08:00
xiongguangjie	3d7fc44a9b	update media-server for ts muxer add pat pmt before every video key frame	2022-10-27 17:15:02 +08:00
xiongziliang	1012a5b08a	支持arm64 docker	2022-10-25 23:05:18 +08:00
ziyue	b3fd74ccf0	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-10-20 11:01:18 +08:00
ziyue	7d251e15b3	on_publish hook兼容非标准回复	2022-10-20 11:00:19 +08:00
xiongguangjie	0a71e06d4a	united some code style	2022-10-19 14:55:39 +08:00
xiongguangjie	7b87985f74	Merge remote-tracking branch 'origin/master'	2022-10-19 14:27:49 +08:00
xiongguangjie	0d2e035215	rtsp and rtp h264 lowlatency mode config	2022-10-19 14:20:53 +08:00
ziyue	5bc0f306b7	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit	2022-10-18 19:24:26 +08:00
ziyue	ff6e9f4fc7	修复流注销时，hls无法播完最后一个切片的问题: #1955	2022-10-18 19:23:20 +08:00
baiyfcu	4a51d6b488	修复第三方引用ZLM编译webrtc避免生成dll文件	2022-10-17 10:53:39 +08:00
ziyue	eac5a5b1dc	使用submodule方式添加jsoncpp源码	2022-10-16 21:10:18 +08:00
ziyue	8d80582f89	删除jsoncpp源码	2022-10-16 21:08:03 +08:00
ziyue	ac1abb34da	新增媒体流flush机制：#1996	2022-10-16 19:54:17 +08:00
ziyue	80eef693c6	精确mp4录制时长：#1795	2022-10-16 16:44:54 +08:00
xiongguangjie	bbdcc44eb0	mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms	2022-10-11 16:53:27 +08:00
ziyue	2b64245c14	优化代码	2022-10-08 10:47:09 +08:00
xiongziliang	c790254f46	修复关闭mp4录制不能触发无人观看事件问题：#2010	2022-10-06 13:06:54 +08:00
xiongziliang	5854a26047	修复未开启宏编译失败问题	2022-10-06 12:59:12 +08:00
xiongziliang	a916760ac3	整理webrtc c接口	2022-10-06 12:35:14 +08:00
gongluck	426d76f05c	增加通过offer获取answer的接口，不依赖http模块 ... (cherry picked from commit 94d0505ea6)	2022-10-06 12:35:02 +08:00
ziyue	34838b1b26	rtmp点播采用简单握手，发送心跳包，兼容fms服务器: #2007	2022-09-30 13:36:43 +08:00
xiongguangjie	bfebcd62c7	rtp packet sort set init seq	2022-09-28 15:29:11 +08:00
夏楚	69736fdb63	Merge pull request #1999 from ZLMediaKit/feature/gbsendpassive_random_port_return_immediately ... 当使用tcp被动模式并且使用随机端口时，马上返回让调用者知道端口，以便生成sdp	2022-09-26 16:16:15 +08:00
xiongguangjie	9f716dd8b8	fix gb startsendpassive use random port return immediately not wait	2022-09-26 15:50:02 +08:00
夏楚	718a18558a	Merge pull request #1993 from leo94666/master ... android webrtc player	2022-09-26 14:11:04 +08:00
夏楚	cf5527ed62	Update README.md	2022-09-26 10:32:27 +08:00
夏楚	037dd646d1	Merge pull request #1994 from Dw9/master ... 修复rtsp 推pcm L16, 空指针的异常	2022-09-26 10:27:30 +08:00
Dw9	6f1a45db8a	修复推rtsp L16崩溃	2022-09-25 12:13:09 +08:00
Dw9	9b8f2c5f3d	修复assert路径错误	2022-09-25 12:12:23 +08:00
leo94666	edf2341496	android webrtc player	2022-09-25 10:51:43 +08:00
夏楚	b9a4b3e71a	消除编译警告	2022-09-24 19:07:45 +08:00
夏楚	2f9b3e187b	Merge pull request #1984 from Dw9/master ... c api support srt server	2022-09-23 14:29:12 +08:00
xiongguangjie	c363b30360	srt optimize ack send logic ignore too many ack packet	2022-09-23 09:35:10 +08:00
Dw9	43bf7c7918	c api support srt server	2022-09-22 21:18:34 +08:00
Dw9	b782832a74	fix typo	2022-09-22 21:16:56 +08:00
xiongguangjie	02aad5d256	srt avoid ack time map memory not release	2022-09-22 19:21:14 +08:00
xiongguangjie	a74a9ec0d7	remove srt debug log	2022-09-22 12:03:53 +08:00
xiongguangjie	801f705628	fix srt ack packet packet buf length error	2022-09-22 12:00:02 +08:00
xiongguangjie	642ca4997a	add more dump	2022-09-22 01:07:10 +08:00