Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

8.0

copilot/reliable-udp-projects

feature/async_write_file

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

#1

#1

#10

#10

#11

#11

#12

#12

#13

#13

#14

#14

#15

#15

#16

#16

#17

#17

#18

#18

#19

#19

#2

#2

#20

#20

#21

#21

#22

#23

#23

#24

#24

#25

#25

#26

#26

#27

#27

#28

#28

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#4

#4

#5

#5

#6

#6

#7

#7

#8

#8

#9

#9

Mono Color

• b6d3ec5251 完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口 xiongziliang 2022-06-11 12:56:03 +0800
• be995f9cd2 !17 【功能请求】 /index/api/getMediaList接口 增加LOSS字段用于统计每个轨道丢包率反馈 * update webrtc/WebRtcPusher.h. * update webrtc/WebRtcPusher.cpp. * update webrtc/WebRtcTransport.h. * update webrtc/WebRtcTransport.cpp. * update src/Common/MediaSource.h. * update src/Common/MediaSource.cpp. * update server/WebApi.cpp. Leon 2022-06-11 04:31:06 +0000
• c212ff913a
  Pre Merge pull request !17 from Leon/master Leon 2022-06-11 04:28:02 +0000
• 3a9408bcec
  webrtc answer m-lines次序错误 (#1695) sha-long-ba-si 2022-06-11 12:26:31 +0800
• 483a75284e 修复udp发送失败导致的问题：#1444, #1645 xiongziliang 2022-06-11 12:24:33 +0800
• 49a0183df0 fix clang format change include order result in windows build error xiongguangjie 2022-06-09 22:54:24 +0800
• f58211fb08 optimize send nack when check packet lost send nack immediately xiongguangjie 2022-06-09 19:30:03 +0800
• ed14d9373b
  update webrtc/WebRtcPusher.h. Leon 2022-06-08 09:09:02 +0000
• 8bb41ebcb8
  update webrtc/WebRtcPusher.cpp. Leon 2022-06-08 09:07:46 +0000
• 24b532c2ca
  update webrtc/WebRtcTransport.h. Leon 2022-06-08 09:06:23 +0000
• c5a6916378
  update webrtc/WebRtcTransport.cpp. Leon 2022-06-08 09:04:45 +0000
• e299832f61
  update src/Common/MediaSource.h. Leon 2022-06-08 08:51:37 +0000
• c0e2257506
  update src/Common/MediaSource.cpp. Leon 2022-06-08 08:48:14 +0000
• 2f2868fab3
  update server/WebApi.cpp. Leon 2022-06-08 08:34:12 +0000
• e5ca3aa0fb 格式化代码 ziyue 2022-06-07 10:01:42 +0800
• e415230e47 格式化srt相关代码 ziyue 2022-06-07 09:52:20 +0800
• 020b8b85ea try fix for windows build xiongguangjie 2022-06-06 22:13:53 +0800
• c92fc8a4a8 format code and remove some useless code xiongguangjie 2022-06-06 20:40:04 +0800
• 83d75c9a72 add srt config for lantency multiplier xiongguangjie 2022-06-06 19:55:47 +0800
• 9f357c24b8 avoid seq cycle xiongguangjie 2022-06-06 18:18:26 +0800
• b8806657cd for srt lantency calculate when handshake xiongguangjie 2022-06-05 14:09:35 +0800
• 3cca4015c5 fix rtt and rtt variance xiongguangjie 2022-06-05 12:13:28 +0800
• 62dfed39f7 fix timelatency not take effect and avoid buffer is liner avoid cycle xiongguangjie 2022-06-05 11:07:42 +0800
• 6f05cf803d prevent cycle for time lantency and available size xiongguangjie 2022-06-04 22:42:28 +0800
• adaffcc245 prevent pkt seq cycle and time stamp cycle xiongguangjie 2022-06-04 22:09:56 +0800
• 71ce31d5c0 for some optimize and anti pkt lost and force pop packet when too late xiongguangjie 2022-06-04 20:51:49 +0800
• 89b135400c Merge remote-tracking branch 'origin/master' into feature/srt xiongguangjie 2022-06-04 15:47:47 +0800
• 086146a344 try fix windows build error xiongguangjie 2022-06-04 14:05:51 +0800
• 9a57353470 add srt on readme xiongguangjie 2022-06-04 13:31:36 +0800
• 4d9a55b924 add srt usage for zlm xiongguangjie 2022-06-04 13:31:15 +0800
• 92420f8392 check stream id xiongguangjie 2022-06-04 13:30:59 +0800
• cd6b0ee0c4 fix peer ip error xiongguangjie 2022-06-04 12:22:55 +0800
• af9bd2dd0a fix streamid zero error xiongguangjie 2022-06-04 12:03:56 +0800
• 91aa9c494c srt can play stream xiongguangjie 2022-06-04 11:23:18 +0800
• df9a9649b0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-04 11:08:13 +0800
• b23cbaa0f8 on_publish hook新增continue_push_ms参数，用于断连续推延时控制 xiongziliang 2022-06-04 11:06:35 +0800
• 6237dd48dc add commet and remove compile warn xiongguangjie 2022-06-04 10:11:28 +0800
• 7f65e082f5 can build prepare for play ts stream by srt xiongguangjie 2022-06-03 22:47:52 +0800
• 82da99eef3 add shutdown packet and flow report xiongguangjie 2022-06-03 21:17:01 +0800
• b9f66ca1ec add srt push string xiongguangjie 2022-06-03 20:38:35 +0800
• 18f4870cfe emit push is srt xiongguangjie 2022-06-03 20:26:53 +0800
• 7606dd7110 for srt push fix ack paramter error result in pkt lost xiongguangjie 2022-06-03 20:18:34 +0800
• 7038924c6f for srt set recv buf xiongguangjie 2022-06-03 18:05:24 +0800
• ddc5b59a65 some change xiongguangjie 2022-06-03 17:49:43 +0800
• 9fadc22c80 srt can push but bandwith estimate has error xiongguangjie 2022-06-03 16:47:53 +0800
• 1891c4e391 add srt push type xiongguangjie 2022-06-03 15:02:07 +0800
• aa2ff01d9f first commit for srt intergrate xiongguangjie 2022-06-03 13:25:32 +0800
• 59dcd03b70
  修改hls拉流后closestream崩溃的bug (#1678) taojishou 2022-06-01 13:05:49 +0800
• b0beea7781 修复笔误 xiongziliang 2022-05-30 12:44:11 +0800
• cea30f8180 修复低版本gcc编译问题:#1667 xiongziliang 2022-05-29 22:13:07 +0800
• fd52ba31b0 忽略SIGHUP信号 xiongziliang 2022-05-29 21:44:53 +0800
• ea6ef2779e 新增url判空逻辑 xiongziliang 2022-05-29 21:36:34 +0800
• 4f05aef245 兼容一些老的c编译器: #1668 xiongziliang 2022-05-29 21:30:06 +0800
• 57d65e47cf 暂时关闭EPOLLEXCLUSIVE特性 xiongziliang 2022-05-28 10:51:09 +0800
• 0639595d1f 更新zltoolkit, 完善对无ipv6网络环境的支持 xiongziliang 2022-05-28 10:42:57 +0800
• fd4145a622 完善对rtp负载为空处理逻辑：#1661 xiongziliang 2022-05-28 10:34:54 +0800
• 6596eec069 Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-28 10:21:48 +0800
• ff2e4cf152 添加ffmpeg相关cmake文件 xiongziliang 2022-05-28 10:18:40 +0800
• a11289e5f0 集群模式，溯源重试改成最大3次: #1663 xiongziliang 2022-05-28 09:52:31 +0800
• 0c5b3f87e5 优化cmake xiongziliang 2022-05-28 09:48:19 +0800
• 93201f40d3 优化日志提示 xiongziliang 2022-05-28 09:47:48 +0800
• 4e57416be9 修复cmake generate export 和 test工程先后变编译错误问题 baiyfcu 2022-05-27 17:03:49 +0800
• 3110284302 修复rtc单独播放音频延时高问题 cqm 2022-05-27 09:24:11 +0800
• e2908e9775
  cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) 夏楚 2022-05-26 20:30:43 +0800
• 989e7b2e75 解决msvc下编译问题 ziyue 2022-05-26 11:59:19 +0800
• 59ff0a9a1a 添加utf-8 bom头，解决msvc下编译问题 ziyue 2022-05-26 11:00:48 +0800
• d79178d116 解决msvc下编译问题 ziyue 2022-05-26 10:49:44 +0800
• 5f3a46d611 FFmpeg未找到时，忽略player_opencv用例 ziyue 2022-05-25 16:06:30 +0800
• cb0e5c6c57 全面更新整理c sdk ziyue 2022-05-25 15:38:32 +0800
• 9736badcea 优化编解码相关代码 ziyue 2022-05-25 15:11:26 +0800
• 0739b1ddd2 完成FFmpeg相关代码迁移改造 ziyue 2022-05-25 14:50:26 +0800
• fa70af7cce 移动FFmpeg相关代码 ziyue 2022-05-25 14:41:08 +0800
• 6f8ff98afd 更新zltoolkit，并更新作者列表 xiongziliang 2022-05-21 19:55:21 +0800
• d78657b706
  检查sendmmsg相关依赖并设置对应的宏 zhaoyi233 2022-05-21 15:18:51 +0800
• b0f0bdb6ae 调整优化webrtc sdp处理相关代码 xiongziliang 2022-05-20 22:14:21 +0800
• 757001ad8a Merge branch 'sdp_munging' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-20 21:58:58 +0800
• 30dbac2c70 提高对不规范GB28181流的兼容性，防止视频轨道被忽略 xiongziliang 2022-05-20 21:52:53 +0800
• 557d70eac5 更新ZLToolKit，修复可能缓存多个gop的bug xiongziliang 2022-05-20 21:52:01 +0800
• b61cce85bd
  修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644) xiongguangjie 2022-05-19 19:01:23 +0800
• c7d7999f53 兼容gcc4.8编译器 ziyue 2022-05-18 20:07:54 +0800
• 2b29e58f71 sdp代码重构, 增加addItem和addAttr cqm 2022-05-18 09:56:53 +0800
• 6cab65f7b0
  支持SDP munging方式simulicast (#1639) mtdxc 2022-05-18 11:26:57 +0800
• 9d9315d8c6 支持SDP munging方式simulicast cqm 2022-05-16 12:54:50 +0800
• ee15c571e0 更新zltoolkit，修复环形缓冲相关bug ziyue 2022-05-17 20:06:36 +0800
• e1d4417062 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-15 18:02:14 +0800
• d9f552ded9 更新zltoolkit ziyue 2022-05-15 18:01:25 +0800
• 251fe1f77c 优化随机端口分配逻辑 xiongziliang 2022-05-14 23:34:33 +0800
• 8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) xiongziliang 2022-05-14 23:25:22 +0800
• 4f768cacf1 修复编译警告 xiongziliang 2022-05-14 18:46:50 +0800
• b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 xiongziliang 2022-05-14 17:14:38 +0800
• f1555a5501 防止忽略shutdown事件 xiongziliang 2022-05-13 23:54:04 +0800
• 3e869c1f1d 修复https 302 跳转http相关bug xiongziliang 2022-05-13 23:24:17 +0800
• dd8b4783b7 Merge remote-tracking branch 'origin/master' xiongziliang 2022-05-13 23:22:10 +0800
• fdbfccb32e hls/http-ts播放器在消费完frame时再触发shutdown事件 xiongziliang 2022-05-13 23:22:00 +0800
• ed13cc691c
  新增metaRTC链接 夏楚 2022-05-13 22:52:30 +0800
• d8b99101cf 更新ZLToolKit xiongziliang 2022-05-13 20:48:34 +0800
• 9e6ff0e798 优化头文件引用: #1627 xiongziliang 2022-05-13 20:48:22 +0800
• b0f15c9647 sctp关闭编译时,关闭datachannel相关功能 xiongziliang 2022-05-13 20:45:04 +0800
• 3dd3897ad6 新增部分作者 xiongziliang 2022-05-13 20:22:19 +0800
• 7e58d91a57 修复rtp two byte ext解析相关bug: #1631 xiongziliang 2022-05-13 20:01:57 +0800