Commit Graph

4176 Commits

Author SHA1 Message Date
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
xiongziliang
aacd6416ba 修正多线程编程线程数异常相关问题 2022-06-19 19:11:07 +08:00
xiongziliang
9ab5ea2b36 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-06-19 18:15:58 +08:00
xiongziliang
0eacda5327 新增docker ci并全面整理ci 2022-06-19 18:14:43 +08:00
夏楚
9fd0db55c4
Merge pull request #1730 from Dw9/patch-1
Update MP4Recorder.cpp
2022-06-19 18:14:18 +08:00
Dw9
1c5380eead
Update MP4Recorder.cpp
fix #1679 
_muxer->openMP4 创建非法的文件夹会失败抛出异常  所以_full_path_tmp等都是空字符串
delete_file的时候 就会从此盘符的""(full_path_tmp)目录挨个删除了。 
复现建议新建个盘符...
2022-06-19 17:27:03 +08:00
xiongziliang
ca66858da2 新增Android ci 2022-06-19 15:38:03 +08:00
custompal
ea53da64ca 同步代码 2022-06-19 14:26:47 +08:00
xiongziliang
67305b1f9f Android工程开启openssl相关功能 2022-06-19 14:09:58 +08:00
xiongziliang
a44b770d9d 完善Android工程 2022-06-19 01:12:14 +08:00
xiongziliang
d30869d0c9 支持获取http反向代理真实客户端ip: #1388 2022-06-18 22:10:46 +08:00
xiongziliang
6291ee704c http文件服务器修复访问安全漏洞 2022-06-18 21:44:16 +08:00
xiongziliang
d5570ad9b3 忽略udp socket的相关错误 2022-06-18 21:27:07 +08:00
xiongziliang
d72af3e61a 兼容不规范的rtsp url: #904 2022-06-18 21:19:26 +08:00
xiongziliang
53135131a0 更新zltoolkit 2022-06-18 21:10:12 +08:00
xiongziliang
2490fd2115 MS_ASSERT改成抛异常 2022-06-18 21:09:57 +08:00
xiongziliang
ba0eaf26fc 时间戳跳变最大阈值调整为3秒 2022-06-18 21:08:34 +08:00
xiongziliang
b351f4c7e5 优化日志提示 2022-06-18 21:06:18 +08:00
xiongziliang
b24c4f8d33 默认禁用编译ffmpeg相关特性 2022-06-18 20:50:25 +08:00
xiongziliang
94839fd93c 添加bom头 2022-06-18 14:34:58 +08:00
xiongziliang
272eca1249 hook重试新增延时功能 2022-06-18 14:10:47 +08:00
xiongziliang
06f5bda8b3 Merge branch 'master' of gitee.com:leon14631/ZLMediaKit 2022-06-18 13:29:14 +08:00