cqm
03526f141e
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit into feature/transcode2
...
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
Linux_Python / build (push) Has been cancelled
macOS / build (push) Has been cancelled
macOS_Python / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Windows_Python / build (push) Has been cancelled
# Conflicts:
# conf/config.ini
# src/Codec/Transcode.cpp
# src/Common/MediaSource.h
# src/Common/MultiMediaSourceMuxer.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/macros.h
# webrtc/WebRtcPusher.cpp
# webrtc/WebRtcTransport.cpp
# webrtc/WebRtcTransport.h
2026-04-03 09:56:05 +08:00
baigao-X
3fb43c5fef
feat: 增加webrtc代理拉流 ( #4389 )
...
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
- 增加客户端模式，支持主动拉流、推流：
- addStreamProxy接口新增支持whep主动拉流，拉流地址目前只兼容zlm的whep url。
- addStreamPusherProxy接口新增支持whip主动推流，推流地址目前只兼容zlm的whip url。
- 以上推流url格式为webrtc[s]://server_host:server_port/app/stream_id?key=value, 内部会自动转换为http[s]://server_host:server_port/index/api/[whip/whep]?app=app&stream=stream_id&key=value。
- 增加WebRtc p2p 模式：
- 增加 ICE FULL模式。
- 增加STUN/TURN 服务器。
- 增加websocket 信令。
- 增加P2P代理拉流。
---------
Co-authored-by: xia-chu <771730766@qq.com>
Co-authored-by: mtdxc <mtdxc@126.com>
Co-authored-by: cqm <cqm@97kid.com>
2025-09-20 16:23:30 +08:00
mtdxc
e3dcd9119e
use vars.VERSION_ISSUE_NO ( #3716 )
...
将持续集成编译发布issue版本号，设成可配置，当没设置时不自动发布版本
Co-authored-by: cqm <cqm@97kid.com>
2024-07-17 11:41:20 +08:00
cqm
158f0ad6c8
use vars.VERSION_ISSUE_NO
2024-07-15 08:47:31 +08:00
xiongziliang
170ec3c830
调整持续集成脚本
2024-06-15 12:14:40 +08:00
xiongziliang
577fe86917
调整持续集成，linux ci修改为centos7
2024-06-09 17:44:16 +08:00
xiongziliang
68c0424808
feat: Automatically build package and upload binary files to the issue list
2024-06-01 22:20:06 +08:00
zx
719b137208
修正macos持续集成运行目录 ( #2234 )
...
修改 macos 最后一步运行目录release/linux/Debug/ 改为release/darwin/Debug/
参看build log
https://github.com/ZLMediaKit/ZLMediaKit/actions/runs/4150150582/jobs/7179611556
2023-02-12 22:44:37 +08:00
Xiaofeng Wang
ea57cb6888
macos -> macOS
2022-06-25 11:31:30 +08:00
xiongziliang
aacd6416ba
修正多线程编程线程数异常相关问题
2022-06-19 19:11:07 +08:00
xiongziliang
0eacda5327
新增docker ci并全面整理ci
2022-06-19 18:14:43 +08:00
夏楚
d06b4cdd3a
ci支持pull request
2022-04-19 19:30:55 +08:00
夏楚
c72cf4cbcc
整理命名空间 ( #1409 )
...
* feat: remove using namespace mediakit in header files.
(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)
* feat: remove using namespace mediakit in FFmpegSource.h
* feat: remove using namespace mediakit in RtpExt.h
* feat: remove using namespace mediakit in header files.
* feat: remove using namespace std in header files.
* feat: remove using namespace std in header files when zltoolkit remove std in header
* 补充命名空间
* 整理命名空间
* 整理命名空间2
* 修复macos ci
* 修复编译问题
* 修复编译问题2
* 修复编译问题3
Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
2022-02-02 20:34:50 +08:00
