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

• cffc0743d7 format code use clang-format xiongguangjie 2022-07-14 22:49:31 +0800
• 602b475a3c for rtc send can receive rtcp xr, player can calculate rtt , for metaRTC player send rtcp xr xiongguangjie 2022-07-12 19:26:17 +0800
• 14da5ab2d8
  when start send rtp wait key rtp previous drop (#1789) xiongguangjie 2022-07-09 22:30:43 +0800
• 4f7d3d820f
  Merge pull request #1790 from ZLMediaKit/feature/getnameinfo xiongguangjie 2022-07-09 22:24:37 +0800
• 53d580dfab 解决msvc下getnameinfo链接失败问题 xiongziliang 2022-07-09 22:07:45 +0800
• b02816e9e5 完善配置文件'externIP'说明 xiongziliang 2022-07-09 21:48:14 +0800
• 576056c465
  get ip from env, for externIP in file 'config.ini' (#1786) Haibo Chen 2022-07-09 21:44:57 +0800
• 09a8d53150 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-07-07 17:46:37 +0800
• 4108e81d2f avoid multi rtmp player metadata xiongguangjie 2022-07-07 17:44:19 +0800
• c4988e7cfc 修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 ) Dw9 2022-07-07 16:48:35 +0800
• 2e1a45895a
  修改webrtc码率带宽约束字段 (#1771, #1768) bin-work 2022-07-07 16:44:42 +0800
• 16e791b83c srt use reference value xiongguangjie 2022-07-06 21:40:24 +0800
• 33654c47b4 js rtc player support play audio and video xiongguangjie 2022-07-04 19:58:51 +0800
• 121b78e5dd 推流器主动断开时，避免开启断流续推功能 xiongziliang 2022-07-02 15:36:32 +0800
• 7a24a22661 完善推流判断逻辑 xiongziliang 2022-07-02 13:13:16 +0800
• 87dd1c7f7f avoid loopback ffmpeg push stream exit receive deleteStream message after broken pipe xiongguangjie 2022-07-02 12:33:32 +0800
• f96da3d166 格式化时遵循 C++ 11 标准 Xiaofeng Wang 2022-07-02 10:14:42 +0800
• 9314a6699b
  兼容ffmpeg4.x (#1758) alexliyu7352 2022-06-29 11:02:43 +0800
• 28350c0d05
  Optimize Decoder inheritance relationship (#1760) CharleyWangHZ 2022-06-29 11:01:16 +0800
• 07982b7243
  静态连接到jemalloc库: #1759 alexliyu7352 2022-06-29 10:59:44 +0800
• d622481619 fix multi aac frame in one frame result flv.js play audio error xiongguangjie 2022-06-26 00:54:31 +0800
• ea57cb6888 macos -> macOS Xiaofeng Wang 2022-06-25 11:31:30 +0800
• 14ce2448f3 Fix link and add workflow action status Xiaofeng Wang 2022-06-25 11:28:51 +0800
• 1a7df682ff 统一 CI 命名方式 Xiaofeng Wang 2022-06-25 11:25:07 +0800
• 62569db9a2
  Merge pull request #1745 from ZLMediaKit/feature/check-utf8-bom Xiaofeng Wang 2022-06-25 11:05:08 +0800
• cacba11090 Add workflow action to validate BOM Xiaofeng Wang 2022-06-24 23:26:14 +0800
• b526dacd7c srt media source evnet override getOwnerPoller xiongguangjie 2022-06-24 21:43:02 +0800
• 0916a72db7 fix flow report hook player or pusher judge error xiongguangjie 2022-06-24 16:28:16 +0800
• 266aaf9e0b fix rtsp and rtmp on_flow_report player or pusher judge error xiongguangjie 2022-06-24 09:06:46 +0800
• 9acd1c2b36 修复on_flow_report player状态 baiyfcu 2022-06-23 18:08:21 +0800
• 5162cf6112 more debug info for srt xiongguangjie 2022-06-22 18:41:51 +0800
• dea848610a more detail printf for handshake xiongguangjie 2022-06-22 18:26:37 +0800
• 90874b2b04 dump unsupport handshake xiongguangjie 2022-06-22 18:11:20 +0800
• 70aecffe91
  Update README.md 夏楚 2022-06-22 17:03:57 +0800
• 82f6bfc77a Merge branch 'master' into cus_pr 同步代码 custompal 2022-06-22 11:19:36 +0800
• fde6b436cc 封装rtp server创建和关闭 baiyfcu 2022-06-22 10:31:53 +0800
• 9030547583 同步修复toolkit编译和线程安全问题 baiyfcu 2022-06-21 21:01:00 +0800
• 65a91d1acc
  Update README.md 夏楚 2022-06-20 16:50:12 +0800
• d98f0badbd Merge branch 'master' into cus_pr 同步代码 custompal 2022-06-20 09:40:31 +0800
• 67606050dc 更新docker镜像 xiongziliang 2022-06-19 19:39:48 +0800
• 160b3a67bd Android编译屏蔽openssl xiongziliang 2022-06-19 19:12:43 +0800
• aacd6416ba 修正多线程编程线程数异常相关问题 xiongziliang 2022-06-19 19:01:40 +0800
• 9ab5ea2b36 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-19 18:15:58 +0800
• 0eacda5327 新增docker ci并全面整理ci xiongziliang 2022-06-19 15:54:30 +0800
• 9fd0db55c4
  Merge pull request #1730 from Dw9/patch-1 夏楚 2022-06-19 18:14:18 +0800
• 1c5380eead
  Update MP4Recorder.cpp Dw9 2022-06-19 17:27:03 +0800
• ca66858da2 新增Android ci xiongziliang 2022-06-19 14:40:51 +0800
• ea53da64ca 同步代码 custompal 2022-06-19 14:26:47 +0800
• 67305b1f9f Android工程开启openssl相关功能 xiongziliang 2022-06-19 14:09:58 +0800
• a44b770d9d 完善Android工程 xiongziliang 2022-06-19 01:12:14 +0800
• d30869d0c9 支持获取http反向代理真实客户端ip: #1388 xiongziliang 2022-06-18 22:10:46 +0800
• 6291ee704c http文件服务器修复访问安全漏洞 xiongziliang 2022-06-18 21:44:16 +0800
• d5570ad9b3 忽略udp socket的相关错误 xiongziliang 2022-06-18 21:27:07 +0800
• d72af3e61a 兼容不规范的rtsp url: #904 xiongziliang 2022-06-18 21:19:26 +0800
• 53135131a0 更新zltoolkit xiongziliang 2022-06-18 21:10:12 +0800
• 2490fd2115 MS_ASSERT改成抛异常 xiongziliang 2022-06-18 21:09:57 +0800
• ba0eaf26fc 时间戳跳变最大阈值调整为3秒 xiongziliang 2022-06-18 21:08:34 +0800
• b351f4c7e5 优化日志提示 xiongziliang 2022-06-18 21:06:18 +0800
• b24c4f8d33 默认禁用编译ffmpeg相关特性 xiongziliang 2022-06-18 20:50:25 +0800
• 94839fd93c 添加bom头 xiongziliang 2022-06-18 14:34:58 +0800
• 272eca1249 hook重试新增延时功能 xiongziliang 2022-06-18 14:09:38 +0800
• 06f5bda8b3 Merge branch 'master' of gitee.com:leon14631/ZLMediaKit xiongziliang 2022-06-18 13:29:14 +0800
• 4178c09ffc
  Pre Merge pull request !18 from Leon/master Leon 2022-06-18 05:27:51 +0000
• 7f98f9a750 删除重复的获取gmt offset相关代码 xiongziliang 2022-06-18 13:27:23 +0800
• 266a0ca5b4 修复test_rtp触发断言的问题 xiongziliang 2022-06-18 13:27:15 +0800
• 771844d065
  去除rtp_sender_mtx (#1722) custompal 2022-06-18 13:22:57 +0800
• fda4e83ae4 srt support tlpktdrop=0 feature xiongguangjie 2022-06-18 13:01:04 +0800
• 3e62775db7 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的 custompal 2022-06-17 18:21:00 +0800
• 260b3ff02c 修复笔误 custompal 2022-06-16 19:53:50 +0800
• 7852fdc215 去除rtp_sender_mtx custompal 2022-06-16 19:48:00 +0800
• 56b8a86032 update submodule monktan 2022-06-16 17:14:12 +0800
• 96bf1c9d79 update submodule monktan 2022-06-16 17:02:30 +0800
• fe652e46b4 rtmp session when client stop publish not set push src null avoid judge player or pusher error xiongguangjie 2022-06-16 10:57:48 +0800
• b22e1cf937 fix g711u or g711a rtp judge error xiongguangjie 2022-06-16 10:04:46 +0800
• 5479820748 const payload type variable start's letter is lower case xiongguangjie 2022-06-16 09:59:09 +0800
• 6d701bfef5
  update conf/config.ini. 配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试， Leon 2022-06-15 07:17:02 +0000
• 01350c810e
  update server/WebHook.cpp. 配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试， Leon 2022-06-15 07:14:36 +0000
• 6a337adc91 for rtp server can config pt xiongguangjie 2022-06-15 00:20:53 +0800
• 559b4d3fe7 for srt more check config xiongguangjie 2022-06-14 19:49:45 +0800
• dfec2d76e0 修复close_stream接口无回复问题 ziyue 2022-06-14 16:29:04 +0800
• 4f444203eb Merge remote-tracking branch 'origin/master' into dev xiongguangjie 2022-06-13 10:59:25 +0800
• b771274a7f fix recv cycle buffer crash and avoid send nak packet exceed mtu xiongguangjie 2022-06-12 23:35:30 +0800
• 6503d95853 add cyclebuffer for recv buf xiongguangjie 2022-06-12 21:11:50 +0800
• 705875f410 添加 dl 依赖库 Xiaofeng Wang 2022-06-12 18:27:55 +0800
• 9e18428d7b delay min is 120ms xiongguangjie 2022-06-11 23:50:47 +0800
• ce7787fe33 force use srt flag 0xbf xiongguangjie 2022-06-11 23:11:14 +0800
• 2e097f13b1 only use periodic NAK xiongguangjie 2022-06-11 23:04:24 +0800
• 4b9f789c79 add srt recv and send packet buf size xiongguangjie 2022-06-11 22:51:11 +0800
• f8373302d0 change srt streamid like srs srt streamid xiongguangjie 2022-06-11 21:37:41 +0800
• 4d6cff36b8 添加bom头 xiongziliang 2022-06-11 16:00:45 +0800
• 8fba694473 注释多余代码，消除编译警告 xiongziliang 2022-06-11 15:14:14 +0800
• 5688337546 添加utf-bom头 xiongziliang 2022-06-11 15:11:03 +0800
• fd11c53a78 Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-11 15:07:58 +0800
• 84d0d1db19 getAllSession接口返回完整可读类名 xiongziliang 2022-06-11 15:03:28 +0800
• 926e78272c 优化获取丢包率相关代码 xiongziliang 2022-06-11 14:45:56 +0800
• 974428d1e7 确保获取丢包率时线程安全 xiongziliang 2022-06-11 14:40:14 +0800
• df7a3242bb 修复获取webrtc推流丢包率除0的bug xiongziliang 2022-06-11 14:23:43 +0800
• f6b4eb418f 优化录制相关代码 xiongziliang 2022-06-11 14:18:55 +0800
• 09af12a183 操作MediaSource对象时确保线程安全 xiongziliang 2022-06-11 14:17:43 +0800
• 97116e1208 完善getOwnerPoller相关逻辑 xiongziliang 2022-06-11 13:08:58 +0800