3893 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongguangjie	ea35002be8	copy srt official packet recve rate algorithm	2022-09-21 19:21:49 +08:00
ziyue	a226794cd2	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-09-20 16:13:14 +08:00
ziyue	6fad6f591f	开启第三方mpeg库编译宏开关，兼容某些国标流	2022-09-20 16:00:13 +08:00
Xiaofeng Wang	b35d41b4b7	Merge pull request #1969 from wasphin/feature/fix-link-flags ... cmake: 修正编译链接问题	2022-09-20 11:05:57 +08:00
xiongguangjie	ec1942fa81	srt connection transfer support	2022-09-20 00:39:42 +08:00
Xiaofeng Wang	0c882d4d79	cmake: fix include directory for assert.h	2022-09-19 21:16:56 +08:00
Xiaofeng Wang	11dfcf3bdb	cmake: -Wl linking flags	2022-09-19 21:02:51 +08:00
Xiaofeng Wang	c282775205	cmake: fix linking asan	2022-09-19 21:00:48 +08:00
ziyue	b77c19c969	更新ssl证书	2022-09-18 21:13:01 +08:00
ziyue	0b355759de	整理webrtc相关代码命名空间	2022-09-18 21:03:05 +08:00
ziyue	15affeff1d	优化关闭媒体源相关逻辑: #1963	2022-09-18 20:36:47 +08:00
xiongziliang	daafe62f35	更新功能一览图	2022-09-17 23:27:42 +08:00
xiongziliang	99b8be9051	更新第三方库，兼容大华某些设备国标流	2022-09-17 09:58:52 +08:00
xiongziliang	12551be33c	提炼ProtocolOption赋值相关逻辑	2022-09-16 23:31:37 +08:00
老衲不出家	c094751f17	Merge pull request #1958 from amani-lei/patch-1 ... 使用docker buildx, 用于支持跨平台build	2022-09-14 11:06:04 +08:00
He Lei	c552d8c1bf	使用docker buildx, 用于支持跨平台build ... docker buildx build --platform=$platform --network=host --build-arg MODEL=$model -t $namespace/$packagename:$model.$version . #docker build --network=host --build-arg MODEL=$model -t $namespace/$packagename:$model.$version .	2022-09-14 10:08:18 +08:00
custompal	08789454c3	rtsp支持指定播放单一track (#1937)	2022-09-13 16:27:00 +08:00
xiongguangjie	d04a6d4355	rtc receive sr reset alive ticker	2022-09-09 23:04:28 +08:00
夏楚	098bd319ab	Android ci fixed (#1952)	2022-09-09 18:06:18 +08:00
夏楚	4a35ddbddb	Merge pull request #1942 from mtdxc/reduce_code ... 简化代码	2022-09-09 11:10:55 +08:00
Mr. shengge	97320a264d	修复c sdk获取视频帧flags信息不对的问题 (#1947)	2022-09-09 11:05:42 +08:00
custompal	d853075175	RtpServer新增tcp主动模式支持 (#1938)	2022-09-09 10:56:28 +08:00
huangxiuqi	258a4dd166	C API和WebHook未找到流回调添加直接关闭机制 (#1948)	2022-09-09 10:55:35 +08:00
xiongguangjie	7f86299c80	rtc stop push unregister mediasource	2022-09-07 19:10:06 +08:00
夏楚	6ca736f88a	Merge pull request #1940 from AlphaWu/master ... 修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。	2022-09-07 15:09:24 +08:00
xiongguangjie	96c19ac85f	修复webrtcsession getIdentifier 为空的bug,导致GetAllSession webrtcsession的id 为空	2022-09-07 13:58:26 +08:00
cqm	999e0b274e	简化代码: ... - MediaSource引入shortUrl和getUrl来简化日志输出 - WebApi引入fillSockInfo	2022-09-07 11:47:15 +08:00
WuPeng	f765e5365b	修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。	2022-09-06 21:13:11 +08:00
ziyue	4f47b7a5fe	修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题	2022-09-05 14:59:46 +08:00
xiongziliang	00c9749b5d	防止多个track时获取rtp推流丢包率失败	2022-09-03 16:47:37 +08:00
xiongziliang	5825f8b469	修复错误注释	2022-09-03 16:32:10 +08:00
xiongziliang	06c6654ed5	精简代码	2022-09-03 16:32:10 +08:00
xiongziliang	c8ea6490cd	修复直接拉流代理时同协议流无法注册的问题	2022-09-03 16:32:10 +08:00
xiongziliang	20f1275c58	rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877	2022-09-03 16:32:09 +08:00
xiongziliang	cd269672a5	新增作者	2022-09-03 14:55:46 +08:00
PioLing	0948a3df31	支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930)	2022-09-03 09:54:09 +08:00
夏楚	aa6581c253	Merge pull request #1931 from custompal/cus_pr ... 补充getMediaPlayerList接口注释及postman示例	2022-09-02 18:10:11 +08:00
custompal	dd6495cc07	补充getMediaPlayerList接口注释及postman示例	2022-09-02 17:46:09 +08:00
夏楚	feaacf39ec	Merge pull request #1920 from custompal/cus_pr ... 增加获取媒体流播放器列表功能	2022-09-02 17:30:50 +08:00
夏楚	48d49a334d	Update README.md	2022-09-02 11:46:38 +08:00
custompal	33e1e6b88d	getMediaPlayerList返回播放器id以及会话类型名称	2022-09-01 21:52:43 +08:00
custompal	d0214a13e1	防止getPlayerList返回的json数据为null	2022-09-01 17:45:06 +08:00
custompal	38170c702e	修正gcc4.8编译错误	2022-09-01 17:33:36 +08:00
custompal	640ed13d67	更新ZLToolKit	2022-09-01 17:03:16 +08:00
custompal	ce545aa74f	Merge branch 'master' into cus_pr	2022-09-01 16:56:44 +08:00
KevinZang	3585e9f7bc	增加VLC如何播放SRT协议说明 (#1929)	2022-09-01 15:53:19 +08:00
custompal	0d6509ce03	统一部分变量名和代码样式风格	2022-08-30 21:24:25 +08:00
custompal	04aa3ef41f	增加获取媒体流播放器列表功能	2022-08-30 21:05:19 +08:00
xiongzilaing	679c79802f	整理媒体事件相关代码，删除无须重载时的多余代码逻辑	2022-08-28 17:25:56 +08:00
xiongguangjie	67ad2a49c3	srt is player stop handleshake timert	2022-08-27 15:18:32 +08:00