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

• 4a51d6b488 修复第三方引用ZLM编译webrtc避免生成dll文件 baiyfcu 2022-10-17 10:53:39 +0800
• eac5a5b1dc 使用submodule方式添加jsoncpp源码 ziyue 2022-10-16 21:10:18 +0800
• 8d80582f89 删除jsoncpp源码 ziyue 2022-10-16 21:08:03 +0800
• ac1abb34da 新增媒体流flush机制：#1996 ziyue 2022-10-16 19:49:56 +0800
• 80eef693c6 精确mp4录制时长：#1795 ziyue 2022-10-16 16:40:21 +0800
• bbdcc44eb0 mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms xiongguangjie 2022-10-11 16:53:27 +0800
• 2b64245c14 优化代码 ziyue 2022-10-08 10:47:09 +0800
• c790254f46 修复关闭mp4录制不能触发无人观看事件问题：#2010 xiongziliang 2022-10-06 13:06:54 +0800
• 5854a26047 修复未开启宏编译失败问题 xiongziliang 2022-10-06 12:59:12 +0800
• a916760ac3 整理webrtc c接口 xiongziliang 2022-10-06 12:33:48 +0800
• 426d76f05c 增加通过offer获取answer的接口，不依赖http模块 gongluck 2022-09-19 10:46:06 +0800
• 34838b1b26 rtmp点播采用简单握手，发送心跳包，兼容fms服务器: #2007 ziyue 2022-09-30 13:34:56 +0800
• 31293d9fe3 修改录像功能，解决程序coredump的问题。 renlu 2022-09-30 13:29:36 +0800
• bfebcd62c7 rtp packet sort set init seq xiongguangjie 2022-09-28 15:29:11 +0800
• edd719b68c 更新默认证书、修改截图接口，以及录像增加空字符串的判断。 renlu 2022-09-28 08:54:52 +0800
• 69736fdb63
  Merge pull request #1999 from ZLMediaKit/feature/gbsendpassive_random_port_return_immediately 夏楚 2022-09-26 16:16:15 +0800
• 9f716dd8b8 fix gb startsendpassive use random port return immediately not wait xiongguangjie 2022-09-26 15:50:02 +0800
• 718a18558a
  Merge pull request #1993 from leo94666/master 夏楚 2022-09-26 14:11:04 +0800
• cf5527ed62
  Update README.md 夏楚 2022-09-26 10:32:27 +0800
• 037dd646d1
  Merge pull request #1994 from Dw9/master 夏楚 2022-09-26 10:27:30 +0800
• 6f1a45db8a 修复推rtsp L16崩溃 Dw9 2022-09-25 12:13:09 +0800
• 9b8f2c5f3d 修复assert路径错误 Dw9 2022-09-25 12:12:23 +0800
• edf2341496 android webrtc player leo94666 2022-09-25 10:51:43 +0800
• b9a4b3e71a
  消除编译警告 夏楚 2022-09-24 19:07:45 +0800
• 2f9b3e187b
  Merge pull request #1984 from Dw9/master 夏楚 2022-09-23 14:29:12 +0800
• c363b30360 srt optimize ack send logic ignore too many ack packet xiongguangjie 2022-09-23 09:35:10 +0800
• 43bf7c7918 c api support srt server Dw9 2022-09-22 21:18:34 +0800
• b782832a74 fix typo Dw9 2022-09-22 21:16:56 +0800
• 02aad5d256 srt avoid ack time map memory not release xiongguangjie 2022-09-22 19:21:14 +0800
• a74a9ec0d7 remove srt debug log xiongguangjie 2022-09-22 12:03:53 +0800
• 801f705628 fix srt ack packet packet buf length error xiongguangjie 2022-09-22 12:00:02 +0800
• 642ca4997a add more dump xiongguangjie 2022-09-22 01:07:10 +0800
• 533f35dac4 copy srt estimated link capacity algorithm xiongguangjie 2022-09-22 00:34:42 +0800
• ea35002be8 copy srt official packet recve rate algorithm xiongguangjie 2022-09-21 19:21:49 +0800
• a226794cd2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-09-20 16:13:14 +0800
• 6fad6f591f 开启第三方mpeg库编译宏开关，兼容某些国标流 ziyue 2022-09-20 16:00:13 +0800
• b35d41b4b7
  Merge pull request #1969 from wasphin/feature/fix-link-flags Xiaofeng Wang 2022-09-20 11:05:57 +0800
• ec1942fa81 srt connection transfer support xiongguangjie 2022-09-20 00:39:42 +0800
• 0c882d4d79 cmake: fix include directory for assert.h Xiaofeng Wang 2022-09-19 21:15:20 +0800
• 11dfcf3bdb cmake: -Wl linking flags Xiaofeng Wang 2022-09-19 21:02:51 +0800
• c282775205 cmake: fix linking asan Xiaofeng Wang 2022-09-19 21:00:48 +0800
• b77c19c969 更新ssl证书 ziyue 2022-09-18 21:13:01 +0800
• 0b355759de 整理webrtc相关代码命名空间 ziyue 2022-09-18 21:03:05 +0800
• 15affeff1d 优化关闭媒体源相关逻辑: #1963 ziyue 2022-09-18 20:36:47 +0800
• daafe62f35 更新功能一览图 xiongziliang 2022-09-17 23:27:42 +0800
• 99b8be9051 更新第三方库，兼容大华某些设备国标流 xiongziliang 2022-09-17 09:58:52 +0800
• 12551be33c 提炼ProtocolOption赋值相关逻辑 xiongziliang 2022-09-16 23:30:55 +0800
• a0f1e11208 精简生成m3u8文件部分的代码 renlu 2022-09-15 17:15:33 +0800
• e5f43df67b 根据作者最新提交，在TS文件对应的年月日以及小时下面生成对应的m3u8文件。 renlu 2022-09-14 15:03:10 +0800
• c094751f17
  Merge pull request #1958 from amani-lei/patch-1 老衲不出家 2022-09-14 11:06:04 +0800
• c552d8c1bf
  使用docker buildx, 用于支持跨平台build He Lei 2022-09-14 10:08:18 +0800
• 08789454c3
  rtsp支持指定播放单一track (#1937) custompal 2022-09-13 16:27:00 +0800
• d04a6d4355 rtc receive sr reset alive ticker xiongguangjie 2022-09-09 23:04:28 +0800
• 098bd319ab
  Android ci fixed (#1952) 夏楚 2022-09-09 18:06:18 +0800
• 4a35ddbddb
  Merge pull request #1942 from mtdxc/reduce_code 夏楚 2022-09-09 11:10:55 +0800
• 97320a264d
  修复c sdk获取视频帧flags信息不对的问题 (#1947) Mr. shengge 2022-09-09 11:05:42 +0800
• d853075175
  RtpServer新增tcp主动模式支持 (#1938) custompal 2022-09-09 10:56:28 +0800
• 258a4dd166
  C API和WebHook未找到流回调添加直接关闭机制 (#1948) huangxiuqi 2022-09-09 10:55:35 +0800
• 7f86299c80 rtc stop push unregister mediasource xiongguangjie 2022-09-07 19:10:06 +0800
• 6ca736f88a
  Merge pull request #1940 from AlphaWu/master 夏楚 2022-09-07 15:09:24 +0800
• 96c19ac85f 修复webrtcsession getIdentifier 为空的bug,导致GetAllSession webrtcsession的id 为空 xiongguangjie 2022-09-07 13:58:26 +0800
• 999e0b274e 简化代码: - MediaSource引入shortUrl和getUrl来简化日志输出 - WebApi引入fillSockInfo cqm 2022-09-07 11:06:39 +0800
• f765e5365b 修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。 WuPeng 2022-09-06 21:13:11 +0800
• 4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 ziyue 2022-09-05 14:59:46 +0800
• 00c9749b5d 防止多个track时获取rtp推流丢包率失败 xiongziliang 2022-09-03 16:47:37 +0800
• 5825f8b469 修复错误注释 xiongziliang 2022-09-03 16:31:43 +0800
• 06c6654ed5 精简代码 xiongziliang 2022-09-03 16:27:30 +0800
• c8ea6490cd 修复直接拉流代理时同协议流无法注册的问题 xiongziliang 2022-09-03 16:07:53 +0800
• 20f1275c58 rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877 xiongziliang 2022-09-03 15:53:01 +0800
• cd269672a5 新增作者 xiongziliang 2022-09-03 14:55:46 +0800
• 0948a3df31
  支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) PioLing 2022-09-03 09:54:09 +0800
• aa6581c253
  Merge pull request #1931 from custompal/cus_pr 夏楚 2022-09-02 18:10:11 +0800
• dd6495cc07 补充getMediaPlayerList接口注释及postman示例 custompal 2022-09-02 17:46:09 +0800
• feaacf39ec
  Merge pull request #1920 from custompal/cus_pr 夏楚 2022-09-02 17:30:50 +0800
• 48d49a334d
  Update README.md 夏楚 2022-09-02 11:46:38 +0800
• 33e1e6b88d getMediaPlayerList返回播放器id以及会话类型名称 custompal 2022-09-01 21:52:43 +0800
• d0214a13e1 防止getPlayerList返回的json数据为null custompal 2022-09-01 17:45:06 +0800
• 38170c702e 修正gcc4.8编译错误 custompal 2022-09-01 17:33:36 +0800
• 640ed13d67 更新ZLToolKit custompal 2022-09-01 17:03:16 +0800
• ce545aa74f Merge branch 'master' into cus_pr custompal 2022-09-01 16:56:44 +0800
• 3585e9f7bc
  增加VLC如何播放SRT协议说明 (#1929) KevinZang 2022-09-01 15:53:19 +0800
• 0d6509ce03 统一部分变量名和代码样式风格 custompal 2022-08-30 21:24:25 +0800
• 04aa3ef41f 增加获取媒体流播放器列表功能 custompal 2022-08-30 21:05:19 +0800
• 679c79802f 整理媒体事件相关代码，删除无须重载时的多余代码逻辑 xiongzilaing 2022-08-28 17:25:56 +0800
• 67ad2a49c3 srt is player stop handleshake timert xiongguangjie 2022-08-27 15:18:32 +0800
• f9f6fd136a srt handle packet send repeate by timer xiongguangjie 2022-08-27 15:06:03 +0800
• 602c8e068b srt handshake packet send 3 times xiongguangjie 2022-08-27 13:25:23 +0800
• beb6383e72 optimize srt handle shake xiongguangjie 2022-08-27 12:46:35 +0800
• f0ae5a1bd7 优化日志提示 xiongziliang 2022-08-27 11:00:24 +0800
• 0cab9c8d16 rtp发送去除重连机制 xiongziliang 2022-08-27 10:59:15 +0800
• 6a4297845f 新增发送rtp被动关闭hook xiongziliang 2022-08-27 10:53:47 +0800
• c2ab45f78d 完善线程安全设计 xiongziliang 2022-08-27 10:17:06 +0800
• 8b0bd2d224
  Merge pull request #1908 from aaasoft/master 夏楚 2022-08-26 11:43:03 +0800
• 00acea369e
  修复接收rtsp、gb28181等rtp流转为其他协议播放时可能卡顿的bug (#1906) rqb500 2022-08-26 11:42:40 +0800
• 69416f53c9 更新.gitignore文件，排除out目录。 张鹏 2022-08-26 10:37:47 +0800
• 44ba971cb6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-08-23 14:13:36 +0800
• 208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 ziyue 2022-08-23 14:11:32 +0800
• 074d13be0c rpm: 默认不打包 api/cxx-api Xiaofeng Wang 2022-08-22 13:18:05 +0800
• a06b4321be cmake: fix install cxx api headers Xiaofeng Wang 2022-08-22 13:11:17 +0800
• c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 xiongziliang 2022-08-20 13:16:25 +0800