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

• 301cbf0a83
  支持多个rtc候选地址 (#1622) mtdxc 2022-05-12 15:21:09 +0800
• 943deab664
  解决CentOS7下Parse.cpp编译不通过问题 (#1627) starry 2022-05-12 15:12:13 +0800
• 845b2ea8d8
  !16 增加长期保存hls切片的功能 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 夏楚 2022-05-11 03:39:59 +0000
• b83cb425b4
  Pre Merge pull request !16 from AlphaWu/Zafu-Dev AlphaWu 2022-05-10 10:51:54 +0000
• 5bc313bafe 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 WuPeng 2022-05-10 17:32:50 +0800
• 4c1f0c9b7f 修复Windows下绑定端口可能失败的问题 ziyue 2022-05-10 17:28:48 +0800
• 5b51d7cb93 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-10 16:49:42 +0800
• 3c72917ea0 修复bind socket在Windows下失败导致的问题 ziyue 2022-05-10 16:49:08 +0800
• a9d7874467
  Update README.md 夏楚 2022-05-10 15:31:36 +0800
• 1424acf016
  Pre Merge pull request !15 from AlphaWu/ZAFU-Dev AlphaWu 2022-05-10 06:48:27 +0000
• 9861091b18 优先使用ipv4地址 ziyue 2022-05-10 14:48:05 +0800
• 45494c020b bug fixed ziyue 2022-05-10 10:44:12 +0800
• 41faf6ba61 将hls配置项的segKeep有int类型修改为bool类型。 WuPeng 2022-05-09 21:09:01 +0800
• 98816aebad !14 增加长期保存hls切片功能 * 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是… * 忽略Windows下编译生成的out目录 AlphaWu 2022-05-09 03:13:38 +0000
• d037acbf62 完善ipv6支持 ziyue 2022-05-08 17:06:10 +0800
• a44334acaf 全面支持ipv6 ziyue 2022-05-08 16:33:33 +0800
• a95bf960e0 完善ipv6支持 xiongziliang 2022-05-08 09:25:47 +0800
• c14bf7d8b1 修复编译问题 xiongziliang 2022-05-08 00:39:52 +0800
• d66845425c 完善ipv6网络适配 xiongziliang 2022-05-08 00:26:01 +0800
• 3062ea0e7c 初步支持ipv6: #576, #1406 ziyue 2022-05-07 20:06:08 +0800
• 5e08e43e9a
  webrtc测试网页新增datachannel echo显示框 (#1613) Dw9 2022-05-05 16:34:49 +0800
• 5844b61880
  Merge pull request #1607 from Dw9/master Xiaofeng Wang 2022-05-05 09:38:44 +0800
• f5ae52d7c0
  Pre Merge pull request !14 from AlphaWu/Zafu-Dev AlphaWu 2022-05-04 14:15:34 +0000
• fb003714e9 新增webrtc datachannel功能: #1216 xiongziliang 2022-05-04 22:15:21 +0800
• d507b76097
  Update CMakeLists.txt Dw9 2022-05-01 12:19:23 +0800
• 7de6592819 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 WuPeng 2022-04-30 16:11:43 +0800
• 9a6b410109 忽略Windows下编译生成的out目录 WuPeng 2022-04-30 16:09:18 +0800
• 200a193c04 openRtpServer新增ssrc参数修改为追加至函数末尾, 确保代码逻辑一致无歧义: #1572 ziyue 2022-04-28 17:44:35 +0800
• 85399015f9 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-04-28 17:26:05 +0800
• c1d2adebae
  rtmp拉流的兼容性改进 (#1595) alexliyu7352 2022-04-28 14:13:09 +0800
• 5e729d6153 溯源集群模式支持边沿服务器选择开启转hls: #1588 xiongziliang 2022-04-23 18:40:20 +0800
• c31d44d680
  Merge pull request #1584 from Dw9/master 夏楚 2022-04-19 19:45:01 +0800
• 56e72b1191
  ci支持pull request 夏楚 2022-04-19 19:31:22 +0800
• d06b4cdd3a
  ci支持pull request 夏楚 2022-04-19 19:30:55 +0800
• 824f1d2a47
  ci支持pull request 夏楚 2022-04-19 19:30:14 +0800
• 67bb53746e
  Update CMakeLists.txt Dw9 2022-04-19 18:07:03 +0800
• e0dfa8f6da
  Pre Merge pull request !13 from hxm/N/A hxm 2022-04-19 07:52:07 +0000
• 640500761c
  update api/CMakeLists.txt. hxm 2022-04-19 07:52:06 +0000
• c82cc587c8
  fix typo (#1578) Dw9 2022-04-18 11:48:56 +0800
• 97952bdf0f 更新第三方库，修复mp4录制相关问题：1507 xiongziliang 2022-04-16 22:23:26 +0800
• 974055fd17 确保推流器主动断开时，不开启断连续推特性: #1559 xiongziliang 2022-04-16 21:37:07 +0800
• ebe4141026
  c api和测试范例新增webrtc功能 (#1574) Dw9 2022-04-16 15:57:02 +0800
• e712639e33
  openrtpserver接口新增ssrc参数，强制过滤不属于本端口的视频流，以解决视频串流问题 (#1572) wangcker 2022-04-16 15:12:49 +0800
• 2b460c97ed 更新第三方库 xiongziliang 2022-04-16 14:38:38 +0800
• 24472ee346 修复aac adts头大于7个字节时的兼容性问题 xiongziliang 2022-04-16 14:13:55 +0800
• 5144b84ee7 添加bom头 ziyue 2022-04-10 23:58:56 +0800
• f128b35b18
  解决多pps问题 alexliyu7352 2022-04-10 23:43:44 +0800
• 08de795220
  Update H264.h alexliyu7352 2022-04-10 23:38:42 +0800
• a0c1bc13cc
  修复多次调用onShutdown的bug (#1552) alexliyu7352 2022-04-10 19:09:16 +0800
• e065b1dfba 子进程重启失败时，不应通知守护进程退出，确保子进程重启成功 xiongziliang 2022-04-09 21:02:54 +0800
• c334dcfd38 Revert "子进程重启失败时，不断重试，避免重启失败 (#1545)" xiongziliang 2022-04-09 20:57:00 +0800
• 471a8b7735
  子进程重启失败时，不断重试，避免重启失败 (#1545) alexliyu7352 2022-04-09 20:37:36 +0800
• a1b350c9f0 startSendRtp接口udp发送不指定端口时，从端口池获取端口 xiongziliang 2022-04-09 10:33:27 +0800
• a6e82799f5 openRtpServer接口新增re_use_port参数 xiongziliang 2022-04-09 10:26:15 +0800
• 6073175e75 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-09 10:23:33 +0800
• 78d32702e2
  修复由于识别不出关键帧而导致hls不能切片. (#1551) alexliyu7352 2022-04-09 10:22:41 +0800
• 6c0fea4c46 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2022-04-07 20:39:34 +0800
• 75b17b3a6a
  避免m3u8文件为chunked时崩溃 (#1543) alexliyu7352 2022-04-06 14:16:48 +0800
• e4262222f4
  hls拉流时应该适当重试 (#1541) alexliyu7352 2022-04-05 19:49:22 +0800
• efc3e78ba0
  使用emplace_back优化代码 (#1542) alexliyu7352 2022-04-05 19:32:02 +0800
• 8da23da35c 添加utf-8 bom头 xiongziliang 2022-04-03 18:38:07 +0800
• 2818e371b8 完善startSendRtp接口 xiongziliang 2022-04-03 18:25:36 +0800
• de0738b1d1 Merge branch 'feature/rawrtpsend' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-03 17:34:51 +0800
• 7ed8429759
  Merge pull request #1537 from alexliyu7352/alexliyu7352-patch-19 夏楚 2022-04-03 17:33:38 +0800
• 007164ac9b
  崩溃重启时间改成3秒 (#1536) alexliyu7352 2022-04-03 17:32:38 +0800
• 9ea6faa9ce Merge remote-tracking branch 'origin/master' xiongziliang 2022-04-03 17:27:59 +0800
• 949bfd3922 Merge branch 'js_datachannel' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-03 17:12:58 +0800
• 1ed793fe97 初步实现webrtc datachannel sdp握手 xiongziliang 2022-04-03 17:12:23 +0800
• 03dfcbad36 优化webrtc sdp处理相关代码 xiongziliang 2022-04-03 17:10:39 +0800
• a7476e436a
  修复HlsPlayer播放器BUG alexliyu7352 2022-04-01 20:59:58 +0800
• 29ceddd23d fix startsendrtp pt error xgj 2022-04-01 19:15:35 +0800
• 9d532cf16b fix startsendrtp pt error xgj 2022-04-01 19:12:37 +0800
• 61625f458f for webapi startsendrtp can send raw rtp xgj 2022-04-01 18:28:09 +0800
• d5b8613858
  Merge pull request #1525 from wendelong/dev Xiaofeng Wang 2022-03-29 16:05:54 +0800
• 97ea8090ad 修复HLS播放导致程序异常的BUG wendelong 2022-03-29 13:43:17 +0800
• 62543202a5 精简进程管理相关代码 xiongziliang 2022-03-27 22:37:41 +0800
• ae99662a3d 修复编译警告 xiongziliang 2022-03-27 21:57:05 +0800
• 4b9b022690 优化进程管理代码: #1518 xiongziliang 2022-03-27 21:47:00 +0800
• 43c5d05d8f
  使用clone替代fork (#1518) alexliyu7352 2022-03-27 21:25:40 +0800
• 5879947325 webrtc url添加session参数，用于hook追踪会话唯一性 xiongziliang 2022-03-27 21:12:19 +0800
• b0af3334c1 修复firefox上webrtc echo测试无法通过的问题: #1493 xiongziliang 2022-03-26 22:11:50 +0800
• 822a401f30
  优化端口池范围限定逻辑 (#1508) Dw9 2022-03-26 10:15:18 +0800
• 24c6f28ef8 zlm rtc js sdk update for data channel xgj 2022-03-24 18:20:10 +0800
• a16b6cbc59 mp4切片逻辑提高对音视频交织性差的流的兼容性能 xiongziliang 2022-03-20 14:52:15 +0800
• 19c7d1c406 删除多余的日志打印 xiongziliang 2022-03-19 10:54:08 +0800
• b127d8c2a9 rtsp/GB28181随机端口，支持端口范围设置 xiongziliang 2022-03-13 20:48:01 +0800
• 4314006551 调整nack相关参数 xiongziliang 2022-03-13 19:22:19 +0800
• 94282d240e 修复编译问题 xiongziliang 2022-03-12 20:27:22 +0800
• aef2ae65af 优化代码 xiongziliang 2022-03-12 19:29:58 +0800
• 2ff293e2e5 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-03-12 19:28:02 +0800
• b8277974aa webrtc sdp msid不存在时，不添加 xiongziliang 2022-03-12 19:26:08 +0800
• cc91f10103
  修复关闭音频无法进行webrtc echo测试的bug (#1493) Dw9 2022-03-12 19:21:57 +0800
• 76372cd34b 修好addStreamProxy接口获取参数失败的问题 xiongziliang 2022-03-12 15:23:45 +0800
• d239ada9ac 精简代码 xiongziliang 2022-03-12 15:18:12 +0800
• 9ae6abfbf4 更新addStreamProxy接口postman配置文件 xiongziliang 2022-03-12 15:15:52 +0800
• 3c99b3af98 修复addStreamProxy接口笔误 xiongziliang 2022-03-12 15:08:30 +0800
• 9527a2b1cf addStreamProxy接口新增多种转协议相关参数 xiongziliang 2022-03-12 15:07:01 +0800
• 8db01651fe on_publish hook新增rtsp/rtmp/ts/fmp4转协议开关 xiongziliang 2022-03-12 14:39:59 +0800
• 0f1120b8a6 on_publish hook新增多种选项 xiongziliang 2022-03-12 14:34:48 +0800
• 490656ec3e 去除mk_media_init_mute_audio接口 xiongziliang 2022-03-12 14:33:05 +0800