amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,833 Commits 16 Branches 0 Tags 225 MiB
744c1427e8
Commit Graph

3833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ziyue
7d8b212a3c 修复rtmp汇报窗口太小导致循环递归的bug：#1839 2022-07-29 12:02:00 +08:00
Xiaofeng Wang
9ea98642c1
Merge pull request #1837 from wasphin/feature/cmake-fix-sctp 
修正启用 SCTP 后编译问题
 2022-07-29 08:05:14 +08:00
Xiaofeng Wang
b1ccbcc4ae Linux CI 中开启 SCTP 2022-07-28 23:18:23 +08:00
Xiaofeng Wang
c14a777598 修正启用 SCTP 后编译问题 2022-07-28 23:15:22 +08:00
夏楚
d0f0c69f93
Merge pull request #1836 from CharleyWangHZ/master 
Update MediaSource.h
 2022-07-28 19:57:16 +08:00
CharleyWangHZ
2685f3cdc2
Update MediaSource.h 2022-07-28 16:43:03 +08:00
夏楚
76df34de81
Merge pull request #1825 from wasphin/feature/cmake 
整理 CMakeLists.txt
 2022-07-28 14:27:44 +08:00
夏楚
6fd207118a
Merge pull request #1829 from dcan123/master 
新增rtp udp收流增加丢包率
 2022-07-28 14:17:18 +08:00
Xiaofeng Wang
8cb73e1bc3 修正 Windows 编译问题 2022-07-28 00:25:50 +08:00
dingcan
23e0abde04 Update RtpProcess.cpp 2022-07-27 14:13:54 +08:00
dingcan
0a678661e3 Update RtpProcess.cpp 2022-07-27 10:02:15 +08:00
dingcan
532932fd2d Update RtpProcess.h 2022-07-26 14:44:32 +08:00
dingcan
b8d17565d7 修改代码格式 2022-07-26 14:42:42 +08:00
Xiaofeng Wang
310b60276c cmake: try to disable compile warning of C4819 2022-07-26 13:25:36 +08:00
Xiaofeng Wang
8f679831bc camke: fix server compile definitions 2022-07-26 13:23:58 +08:00
Xiaofeng Wang
a35134a5ca cmake: fix version.h path 2022-07-26 13:09:25 +08:00
dingcan
c1b4ccd041 Update RtpProcess.cpp 2022-07-26 11:57:09 +08:00
dingcan
ed6c80cf07 新增rtp udp收流增加丢包率 2022-07-26 11:21:19 +08:00
Xiaofeng Wang
0fb0cc29e5 设置依赖以便推导编译依赖 2022-07-26 00:17:59 +08:00
Xiaofeng Wang
ac378eaaf1 使用统一的编译参数 2022-07-26 00:11:31 +08:00
Xiaofeng Wang
0fc38bbadb 避免对外传递 srtp 依赖 2022-07-26 00:04:03 +08:00
Xiaofeng Wang
388bf71813 Fix finding mmsghdr 2022-07-25 23:49:38 +08:00
Xiaofeng Wang
0b33769ee9 cmake: 库列表名称变更 2022-07-25 23:44:02 +08:00
Xiaofeng Wang
d850846612 cmake: 检查 target 来确认功能是否已启用 2022-07-25 13:52:26 +08:00
夏楚
e7cb05d3b4
Merge pull request #1822 from Dw9/master 
c api支持从mp4推送rtp
 2022-07-25 10:33:29 +08:00
Xiaofeng Wang
9d3ead61de 整理 CMakeLists.txt 2022-07-25 00:22:30 +08:00
Xiaofeng Wang
8192b37cd4 修正 ENABLE_RTPPROXY 的处理 2022-07-24 22:30:59 +08:00
Dw9
40099df3c0 c api支持从mp4推送rtp 2022-07-24 08:51:11 +08:00
ziyue
0f47abd3ac 更新zltoolkit 2022-07-22 16:25:29 +08:00
ziyue
ec7fe5cc9a 整理frame相关代码，完善FrameStamp重载函数 2022-07-22 16:20:47 +08:00
夏楚
7b3968d949
Merge pull request #1809 from Dw9/master 
完善test_player
 2022-07-19 11:15:41 +08:00
Dw9
8e63b7fefa 完善test_player 2022-07-18 22:30:28 +08:00
ziyue
305722e5d6 docker开启ffmpeg相关功能 2022-07-18 16:54:38 +08:00
ziyue
44d9d04053 新增代码分析ci 2022-07-18 16:54:20 +08:00
ziyue
5a9c6c7460 linux ci 开启FFmpeg相关功能 2022-07-18 16:54:03 +08:00
ziyue
b19574cea7 防止内存越界 2022-07-18 15:41:18 +08:00
夏楚
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