3547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
夏楚	d703ec29c6	Merge pull request #1805 from ZLMediaKit/feature/fix_rtsp_player_pt_error ... Feature/fix rtsp player pt error	2022-07-18 11:25:16 +08:00
xiongguangjie	b53ad2cc2d	for rtsp sdp pt more check	2022-07-17 00:30:12 +08:00
xiongguangjie	3eaf7897a7	rtsp player trust sdp pt ,ingore other pt compatible hik nvr record	2022-07-17 00:26:07 +08:00
xiongguangjie	7db7d5bec0	Merge pull request #1803 from custompal/cus_pr ... getMp4RecordFile接口可使用自定义的录像保存根目录来搜索文件	2022-07-15 21:20:18 +08:00
custompal	1291bf1d21	添加bom头	2022-07-15 20:01:00 +08:00
custompal	d3b37b76bd	getMp4RecordFile接口可使用自定义的录像保存根目录来搜索文件	2022-07-15 19:53:10 +08:00
custompal	a0de7577fe	Merge branch 'master' into cus_pr ... 同步代码	2022-07-15 19:24:44 +08:00
ziyue	d4ad44c83e	更新zltoolkit	2022-07-15 11:15:34 +08:00
夏楚	6aa1c239b8	webrtc支持 rtcp xr(#1796) ... metaRTC 播放时，会发送rtcp xr，因此处理rtcp xr 来兼容	2022-07-15 11:11:30 +08:00
xiongguangjie	cffc0743d7	format code use clang-format	2022-07-14 22:49:31 +08:00
xiongguangjie	602b475a3c	for rtc send can receive rtcp xr, player can calculate rtt , for metaRTC player send rtcp xr	2022-07-12 19:26:17 +08:00
xiongguangjie	14da5ab2d8	when start send rtp wait key rtp previous drop (#1789)	2022-07-09 22:30:43 +08:00
xiongguangjie	4f7d3d820f	Merge pull request #1790 from ZLMediaKit/feature/getnameinfo ... 解决msvc下getnameinfo链接失败问题	2022-07-09 22:24:37 +08:00
xiongziliang	53d580dfab	解决msvc下getnameinfo链接失败问题	2022-07-09 22:07:45 +08:00
xiongziliang	b02816e9e5	完善配置文件'externIP'说明	2022-07-09 21:48:14 +08:00
Haibo Chen	576056c465	get ip from env, for externIP in file 'config.ini' (#1786)	2022-07-09 21:44:57 +08:00
xiongguangjie	09a8d53150	Merge remote-tracking branch 'origin/master'	2022-07-07 17:46:37 +08:00
xiongguangjie	4108e81d2f	avoid multi rtmp player metadata	2022-07-07 17:44:19 +08:00
Dw9	c4988e7cfc	修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 )	2022-07-07 16:56:54 +08:00
bin-work	2e1a45895a	修改webrtc码率带宽约束字段 (#1771, #1768)	2022-07-07 16:44:42 +08:00
xiongguangjie	16e791b83c	srt use reference value	2022-07-06 21:40:24 +08:00
xiongguangjie	33654c47b4	js rtc player support play audio and video	2022-07-04 19:58:51 +08:00
xiongziliang	121b78e5dd	推流器主动断开时，避免开启断流续推功能	2022-07-02 15:36:44 +08:00
xiongziliang	7a24a22661	完善推流判断逻辑	2022-07-02 13:13:16 +08:00
xiongguangjie	87dd1c7f7f	avoid loopback ffmpeg push stream exit receive deleteStream message after broken pipe	2022-07-02 12:33:32 +08:00
Xiaofeng Wang	f96da3d166	格式化时遵循 C++ 11 标准	2022-07-02 10:15:36 +08:00
alexliyu7352	9314a6699b	兼容ffmpeg4.x (#1758)	2022-06-29 11:02:43 +08:00
CharleyWangHZ	28350c0d05	Optimize Decoder inheritance relationship (#1760)	2022-06-29 11:01:16 +08:00
alexliyu7352	07982b7243	静态连接到jemalloc库: #1759	2022-06-29 10:59:44 +08:00
xiongguangjie	d622481619	fix multi aac frame in one frame result flv.js play audio error	2022-06-26 00:54:31 +08:00
Xiaofeng Wang	ea57cb6888	macos -> macOS	2022-06-25 11:31:30 +08:00
Xiaofeng Wang	14ce2448f3	Fix link and add workflow action status	2022-06-25 11:28:51 +08:00
Xiaofeng Wang	1a7df682ff	统一 CI 命名方式	2022-06-25 11:25:07 +08:00
Xiaofeng Wang	62569db9a2	Merge pull request #1745 from ZLMediaKit/feature/check-utf8-bom ... Add workflow action to validate BOM	2022-06-25 11:05:08 +08:00
Xiaofeng Wang	cacba11090	Add workflow action to validate BOM	2022-06-25 11:03:11 +08:00
xiongguangjie	b526dacd7c	srt media source evnet override getOwnerPoller	2022-06-24 21:43:02 +08:00
xiongguangjie	0916a72db7	fix flow report hook player or pusher judge error	2022-06-24 16:28:16 +08:00
xiongguangjie	266aaf9e0b	fix rtsp and rtmp on_flow_report player or pusher judge error	2022-06-24 09:06:46 +08:00
baiyfcu	9acd1c2b36	修复on_flow_report player状态	2022-06-23 18:08:21 +08:00
xiongguangjie	5162cf6112	more debug info for srt	2022-06-22 18:41:51 +08:00
xiongguangjie	dea848610a	more detail printf for handshake	2022-06-22 18:26:37 +08:00
xiongguangjie	90874b2b04	dump unsupport handshake	2022-06-22 18:11:20 +08:00
夏楚	70aecffe91	Update README.md	2022-06-22 17:03:57 +08:00
custompal	82f6bfc77a	Merge branch 'master' into cus_pr ... 同步代码	2022-06-22 11:19:36 +08:00
baiyfcu	fde6b436cc	封装rtp server创建和关闭	2022-06-22 10:31:53 +08:00
baiyfcu	9030547583	同步修复toolkit编译和线程安全问题	2022-06-21 21:01:00 +08:00
夏楚	65a91d1acc	Update README.md	2022-06-20 16:50:12 +08:00
custompal	d98f0badbd	Merge branch 'master' into cus_pr ... 同步代码	2022-06-20 09:40:31 +08:00
xiongziliang	67606050dc	更新docker镜像	2022-06-19 19:46:44 +08:00
xiongziliang	160b3a67bd	Android编译屏蔽openssl	2022-06-19 19:12:43 +08:00