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

• 3b3a83b524
  修复MediaSource在startSendRtp后无法注销的bug (#2187) Dw9 2023-01-07 21:31:46 +0800
• f5755a17e7 合并 #2183 ziyue 2023-01-02 12:04:06 +0800
• 08c47ff4f0 Merge branch 'feature/editable_rtsp_sdp' of github.com:a-ucontrol/ZLMediaKit ziyue 2023-01-02 11:59:56 +0800
• 77e46353ce 新增支持mjpeg es rtp流 ziyue 2022-12-30 18:04:15 +0800
• ae950606cb 修复JPEGTrack无法就绪的bug ziyue 2022-12-30 18:03:21 +0800
• fda77f0daf !23 fix typo in RtspSession.cpp * fix typo in RtspSession.cpp Ikko Ashimine 2022-12-30 09:15:14 +0000
• afa6465178 Changes to MP4Muxer for CodecJPEG Alexandr 2022-12-30 08:56:57 +0300
• 8bcc2cddc8 Build without usrsctp Alexandr 2022-12-30 08:51:37 +0300
• dc26bbf145 protected virtual bool sendRtspResponse(...) Alexandr 2022-12-30 08:50:30 +0300
• 338ddaf3b9
  !1 合并hls录像部分代码 Merge pull request !1 from yinxiang/hls_record yinxiang 2022-12-28 03:08:34 +0000
• 82af21f910 添加hls录像功能 renlu 2022-12-28 11:02:02 +0800
• cf0da71845
  !16 合并作者最新提交 Merge pull request !16 from yinxiang/v1.1.2_20221130 yinxiang 2022-12-28 02:11:02 +0000
• eed5f02380
  rtsp/rtp 新增支持mjpeg编码 (#2166) a-ucontrol 2022-12-21 10:32:16 +0300
• 60ef4f50c8 修改不录像的设备的无人观看时长为130秒，以后就不需要改配置文件了。 renlu 2022-12-16 10:12:36 +0800
• 96f549ab32 avoid bug for #2159 xiongguangjie 2022-12-15 19:17:09 +0800
• 9fe0ed918e
  Pre Merge pull request !23 from Ikko Ashimine/N/A Ikko Ashimine 2022-12-14 07:48:28 +0000
• 55dcae06a0
  fix typo in RtspSession.cpp availabe -> available Ikko Ashimine 2022-12-14 07:48:26 +0000
• f6a36180b4 修复webrtc转发可能内存越界的bug: #2159 monktan89 2022-12-14 15:08:59 +0800
• 56ccd4332a 提高rtsp播放器兼容性: #2159 monktan89 2022-12-14 15:08:24 +0800
• 272b65bb4e 无人观看断流的时候，继续判断是否在录像，如果在录像，不断流 renlu 2022-12-09 11:24:17 +0800
• 9d40c82141 修复手机推rtc,其他协议拉流画面旋转 Dw9 2022-12-08 21:52:55 +0800
• fe22ed258a 添加设备是否正在录像的日志。 renlu 2022-12-08 16:53:42 +0800
• 7c05c474e9 去掉读m3u8文件，并删除直播的三个ts文件的操作。 renlu 2022-12-08 10:21:47 +0800
• c28e96c3af 从直播到录像，不删除直播的8个切片。 renlu 2022-12-08 09:47:33 +0800
• 0d40bf9272 去掉延时30s再删除直播的ts的操作。从直播到录像直接删除直播的8个ts切片。 renlu 2022-12-07 08:52:01 +0800
• 696e28765b 添加配置项 非录像状态下的无人观看延时时长。 renlu 2022-12-06 14:26:57 +0800
• 04422b31b6 完善非法url提示:#2129 xiongziliang 2022-12-04 16:21:08 +0800
• f05a9501fa
  Unified code style (#2137) 老衲不出家 2022-12-02 14:43:06 +0800
• 7801467e36 修改文件编码各位为UFT-8 BOM renlu 2022-12-02 11:01:15 +0800
• 429a6ff0a1
  !14 合并作者截止20221130的更新 Merge pull request !14 from yinxiang/master yinxiang 2022-12-02 02:32:22 +0000
• fd040192b1 Merge branch 'v1.1.2_20221130' of gitee.com:gwds_1/ZLMediaKit into master yinxiang 2022-12-02 02:31:27 +0000
• a12b7c8021 修正代码拼写错误 monktan89 2022-11-30 18:24:35 +0800
• 68ea5465cc 修复addStreamProxy后，马上startSendRtp，触发的无人观看事件回调是MediaSourceNull的信息，导致无法关闭流bug(#2120) monktan89 2022-11-29 11:33:16 +0800
• 754073918a
  Header refactor (#2115) mtdxc 2022-11-29 11:07:13 +0800
• 59ecdd13e5 fix: WebRtcTransport 切换 poller 线程时，创建 WebRtcSession 不需要加锁 Johnny 2022-11-28 17:52:28 +0800
• bc4fa2bc53
  fix(rtcp/bye): 收到rtcp bye时不断开webrtc连接 (#2123) johzzy 2022-11-28 17:52:37 +0800
• 99e420d784 修复析构中调用getOwnerPoller抛异常导致崩溃的bug renlu 2022-11-28 16:47:21 +0800
• 64ee0bcaf2 修改Bug: 从直播到录像，缺少第一个ts文件。 renlu 2022-11-28 16:31:00 +0800
• 6c655810ec 修复on_err事件死循环的bug: #2121 ziyue 2022-11-28 14:28:56 +0800
• fef9d31631
  webrtc支持通过http参数指定是否优先tcp模式 (#2105) Dw9 2022-11-27 12:43:16 +0800
• 50fa671564 修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117 xiongziliang 2022-11-26 10:14:37 +0800
• 68358155c9
  !12 合并作者最新提交 Merge pull request !12 from yinxiang/master yinxiang 2022-11-22 03:18:30 +0000
• b940e13d2d Merge branch 'v1.1.1_20221122' of gitee.com:gwds_1/ZLMediaKit into master yinxiang 2022-11-22 03:17:32 +0000
• 5364d8a001 删除直播生成的8个ts文件。以免多次播放导致ts文件累积过多占用内存。 renlu 2022-11-21 17:10:36 +0800
• 9fd5152aa1 确保webrtc关闭udp模式时可用 ziyue 2022-11-19 09:52:10 +0800
• d910c80a00 优化webrtc iceandidate端口相关代码 ziyue 2022-11-19 09:46:04 +0800
• a9e53aae70 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit ziyue 2022-11-19 09:38:44 +0800
• 188ee1f61a 消除编译警告 ziyue 2022-11-19 09:37:49 +0800
• 68948288e0 TcpSession/UdpSession统一为Session类 ziyue 2022-11-19 09:33:10 +0800
• 0d6fa1281a add rtc tcp port config and ignore candidate when port is 0 xiongguangjie 2022-11-19 01:51:53 +0800
• 89959ef02f
  支持webrtc over tcp模式 夏楚 2022-11-18 22:58:29 +0800
• 47530ce830
  新增支持webrtc over tcp模式 (#2092) Dw9 2022-11-18 22:52:57 +0800
• fc433de9ac 适配webrtc AV1编码: #2091 ziyue 2022-11-18 16:47:02 +0800
• 255ccb4265 精简rtp服务器相关代码 ziyue 2022-11-18 16:42:40 +0800
• df14924a99 优化rtmp服务器兼容性: #2078 ziyue 2022-11-15 20:53:24 +0800
• 034e29b25a 修复rtsp basic鉴权相关bug: #2087 ziyue 2022-11-15 20:52:27 +0800
• 87353534af fix rtp server process removed server not clear xiongguangjie 2022-11-14 14:04:57 +0800
• 228fa17327 windows平台默认开启wepoll(iocp) xiongziliang 2022-11-13 00:38:56 +0800
• a65cc8bbfa 修复Android编译问题 xiongziliang 2022-11-13 00:37:45 +0800
• 3fdd5a86c9 MediaServer -v 打印代码日期 xiongziliang 2022-11-13 00:13:02 +0800
• 9bb6a2f828 全面整理转协议相关配置文件 xiongziliang 2022-11-12 23:54:35 +0800
• 946945ce7b 优化代码 整理代码 xiongziliang 2022-11-12 21:59:48 +0800
• 6ffbcbfde5
  优化Ehome协议兼容性 (#2063) samosirl 2022-11-12 21:03:54 +0800
• b54f50c7c0 修复hls流注销时相关bug:#2082 xiongziliang 2022-11-12 09:57:47 +0800
• a37268f003 格式化代码 夏楚 2022-11-12 01:52:49 +0000
• bc63142712 add rtp server timeout hook xiongguangjie 2022-11-10 16:58:02 +0800
• af554bc376
  update media-server (#2075) Aven 2022-11-09 17:44:38 +0800
• 25a9e51b00 添加编译问题上报模版 Xiaofeng Wang 2022-11-07 10:28:36 +0800
• c8d95617a0 更新ZLToolKit xiongziliang 2022-11-06 00:51:15 +0800
• 44fd6b86bc 完善版本信息 xiongziliang 2022-11-06 00:38:14 +0800
• 04e2952d12 更新zltoolkit xiongziliang 2022-11-05 23:59:00 +0800
• 0053148139 优化MultiMediaSourceMuxer相关代码 xiongziliang 2022-11-05 20:47:33 +0800
• 7e95bd2078 修复MSVC编译问题 monktan89 2022-11-03 10:51:49 +0800
• 2b804514e1 修复mp4点播流线程安全检查失败bug ziyue 2022-11-01 22:02:28 +0800
• 5877d3942e RtpServer确保超时回收 ziyue 2022-11-01 17:54:41 +0800
• 2cdeddeb2c RtpServer支持udp与tcp模式并存 ziyue 2022-11-01 17:27:27 +0800
• 60d96f4f3b 优化FrameDispatcher相关代码 ziyue 2022-11-01 16:52:52 +0800
• d04761c2c6 Merge branch 'FrameDispatcher_addDelegate_refactor' of github.com:mtdxc/ZLMediaKit ziyue 2022-11-01 16:36:43 +0800
• bfe118d94e 修复RtpProcess析构导致的线程问题 ziyue 2022-11-01 16:05:23 +0800
• f5a032c9a0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-11-01 14:08:36 +0800
• dde352542b private FrameWriterInterfaceHelper cqm 2022-11-01 11:44:50 +0800
• ac3d7bd21f add addDelegate with std::function, remove FrameWriterInterfaceHelper cqm 2022-11-01 08:54:56 +0800
• 520945c2e9 提高线程安全性 ziyue 2022-10-31 17:53:20 +0800
• d2c64b1f09 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-10-31 19:04:04 +0800
• 613aae8bc3 rtp server only tcp mode is none use udp server xiongguangjie 2022-10-31 18:47:42 +0800
• 918b1fce6c 修复hls/ts拉流崩溃问题：#2057 ziyue 2022-10-30 23:50:20 +0800
• 9498b96b95 确保rtp推流线程安全性 xiongziliang 2022-10-30 21:36:35 +0800
• 80eb6dc402 协议解析最大支持4MB分包: #2026 xiongziliang 2022-10-29 22:57:32 +0800
• c25e93fee3 解决启动ffmpeg进程导致shell终端假死的问题：#1662 xiongziliang 2022-10-29 17:44:55 +0800
• 9bb4b55924 修复mk_media_start_send_rtp相关bug: #2044 xiongziliang 2022-10-29 16:48:37 +0800
• 3d7fc44a9b update media-server for ts muxer add pat pmt before every video key frame xiongguangjie 2022-10-27 17:15:02 +0800
• 1012a5b08a 支持arm64 docker xiongziliang 2022-10-25 23:00:13 +0800
• 5a470120a5
  Pre Merge pull request !21 from Leon/master Leon 2022-10-20 03:01:50 +0000
• b3fd74ccf0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-10-20 11:01:18 +0800
• 7d251e15b3 on_publish hook兼容非标准回复 ziyue 2022-10-20 10:59:43 +0800
• 0a71e06d4a united some code style xiongguangjie 2022-10-19 14:55:39 +0800
• 7b87985f74 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-10-19 14:27:49 +0800
• 0d2e035215 rtsp and rtp h264 lowlatency mode config xiongguangjie 2022-10-19 14:20:53 +0800
• 5bc0f306b7 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit ziyue 2022-10-18 19:24:26 +0800
• ff6e9f4fc7 修复流注销时，hls无法播完最后一个切片的问题: #1955 ziyue 2022-10-18 19:23:20 +0800