amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
4,353 Commits 16 Branches 0 Tags 225 MiB
89e21038c2
Commit Graph

273 Commits

Author SHA1 Message Date
cqm
89e21038c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2 
# Conflicts:
#	src/Common/MediaSource.h
#	src/Common/config.h
#	src/Rtsp/RtspMediaSourceImp.h
#	src/Rtsp/RtspMediaSourceMuxer.h
#	src/Rtsp/RtspMuxer.cpp
#	webrtc/WebRtcTransport.cpp
 2024-09-22 11:40:39 +08:00
alex
4152dcd409
AI automatically translates all comments in the code into English (#3917) 2024-09-19 14:53:50 +08:00
cqm
d329f76edf Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into transcode2 
# Conflicts:
#	src/Common/config.cpp
#	src/Common/config.h
 2024-08-19 18:03:03 +08:00
xia-chu
9463d1291d 修复编译警告 2024-07-21 19:47:36 +08:00
cqm
95f4576cf6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2 2024-07-15 08:47:50 +08:00
cqm
e6838f24af fixed build issue 2024-07-15 08:47:31 +08:00
cqm
2ffdfab71e Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2 
# Conflicts:
#	CMakeLists.txt
#	conf/config.ini
#	src/Common/MediaSink.cpp
#	src/Common/MediaSink.h
#	src/Common/MediaSource.cpp
#	src/Common/MultiMediaSourceMuxer.h
#	src/Common/config.cpp
#	src/Common/config.h
#	src/Extension/AAC.cpp
#	src/Extension/AAC.h
#	src/Rtsp/RtpCodec.h
#	src/Rtsp/RtspMuxer.cpp
#	src/Rtsp/RtspMuxer.h
#	webrtc/Nack.cpp
#	webrtc/WebRtcTransport.cpp
 2024-07-15 08:47:30 +08:00
mtdxc
d735aa1797
Media tuple refactor (#3715) 
Co-authored-by: cqm <cqm@97kid.com>
 2024-07-14 09:32:41 +08:00
zhang2349
c72e576420
rtp server新增支持自定义vhost和app名称 (#3693) 
代码来自https://github.com/ZLMediaKit/ZLMediaKit/pull/3446 ， 增加了vhost
 2024-07-09 10:42:10 +08:00
xiongziliang
77d2df1695 移除RtpSelector相关逻辑，优化代码结构 2024-06-09 10:52:10 +08:00
Dw9
d6f166c1f4
Push benchmark supports input from mp4 file (#3588) 2024-06-01 18:15:35 +08:00
xia-chu
af3ef996b0 Avoid build warnings in the main code 2024-03-30 14:59:28 +08:00
xia-chu
390c374086 Optimize the code 
1. change param_strs to params
2. move params from MediaInfo to MediaTuple
3. passing MediaTuple as a parameter for some functions
 2024-03-30 14:41:20 +08:00
xiongziliang
77400832ac Update ZLToolKit 2024-01-06 17:47:43 +08:00
xiongziliang
a106f8dfc0 Avoid blocking the poller thread 2023-12-31 22:10:13 +08:00
夏楚
bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
xiongziliang
c12a6f0aed 适配ZLToolKit 2023-12-02 19:49:28 +08:00
Jovial Young
a13b8417e5
修复rtmps默认端口不对导致无法推/拉流问题 (#2996) 
在使用rtmps推流或者拉流时，端口被默认设置成了1935，正确的端口应该是443.
 2023-11-19 14:37:04 +08:00
xia-chu
5b394fcff7 重写加载mp4文件推流rtsp/rtmp范例程序 2023-11-11 21:34:25 +08:00
xia-chu
a871fc1882 websocket服务器支持在创建器中指定消息类型 
通过该修改可以更灵活的指定同端口下不同websocket服务的消息类型
 2023-10-23 20:59:37 +08:00
Deepslient
67bc0273b4
Modify the readme description (#2859) 2023-10-12 14:38:45 +08:00
cqm
5c92b4e48f 增加FFmpegEncoder和test_audio_transcode, 主要修改有: 
- 使用FFmpegAudioFifo来简化代码
- 修复转码时间戳不规则递增，导致的音频破音和不连续问题
- 使用double来保存_tsp，避免出现2.5ms的frame_size(ffmpeg内置的opus)
 2023-08-14 12:57:01 +08:00
Nick
07a1a929ad
修复HLS点播时下载切片过快的bug (#2635 #2628) 
Co-authored-by: xia-chu <771730766@qq.com>
 2023-07-08 10:18:09 +08:00
夏楚
7e117b1c7f
新增支持http-flv播放器 (#2562) 2023-06-17 10:29:27 +08:00
johzzy
03770ff409
Replace the tuple (vhost/app/stream) with MediaTuple. (#2560) 2023-06-17 10:28:01 +08:00
xia-chu
64b8079ac1 优化函数命名风格 
FindField改名为findSubString
 2023-06-10 14:55:40 +08:00
xia-chu
af0ebf4633 优化Parser代码命名 2023-06-10 14:55:40 +08:00
Johnny
0232caf068 add MediaTuple 2023-05-30 11:01:27 +08:00
xia-chu
cdf97e7605 更新zltoolkit,适配最新代码 2023-04-28 22:04:09 +08:00
xiongziliang
c8a20f85f6 直接打印SockException类 2023-04-23 00:10:18 +08:00
xiongguangjie
c090fc3ea0 test_rtp avoid crash when exit 2023-04-07 23:34:41 +08:00
xiongguangjie
749ef33965 use poller input data avoid throw poll check 2023-04-07 23:09:10 +08:00
xia-chu
4cc2982a2c 重写jitter buffer算法，修复seq回环时可能丢包的bug 2023-03-11 10:17:31 +08:00
xiongziliang
9fdb3de8b2 优化rtp排序抖动缓存算法，提高webrtc/rtsp抗丢包性能 2023-03-06 00:31:11 +08:00
ziyue
a981ce8cb3 优化webrtc nack算法：#2249 2023-02-25 00:19:00 +08:00
老衲不出家
f05a9501fa
Unified code style (#2137) 2022-12-02 14:43:06 +08:00
mtdxc
754073918a
Header refactor (#2115) 
* 优化MultiMediaSourceMuxer头文件包含

* 将MediaSinkDelegate和Demux移到MediaSink中

* MediaSource头文件重构, 独立出PacketCache.h
精简Frame和Track的头文件

* Rtmp头文件重构

* Rtsp头文件重构

* webrtc头文件重构

* 规范.h头文件包含，并将其移到.cpp中:
- 尽量不包含Common\config.h
- Util\File.h
- Rtsp/RtspPlayer.h
- Rtmp/RtmpPlayer.h

* 删除多余的Stamp.h和Base64包含
 2022-11-29 11:07:13 +08:00
ziyue
68948288e0 TcpSession/UdpSession统一为Session类 2022-11-19 09:33:10 +08:00
xiongziliang
9bb6a2f828 全面整理转协议相关配置文件 2022-11-12 23:56:28 +08:00
xiongziliang
9498b96b95 确保rtp推流线程安全性 2022-10-30 21:36:35 +08:00
ziyue
0b355759de 整理webrtc相关代码命名空间 2022-09-18 21:03:05 +08:00
cqm
999e0b274e 简化代码: 
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
 2022-09-07 11:47:15 +08:00
ziyue
35791aac89 优化代码，去除编译警告，修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue
9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue
13dd8c699b 整理cmake 2022-08-01 16:12:52 +08:00
ziyue
bdd83cf61a cpp测试程序添加必要编译宏 2022-07-29 18:14:10 +08:00
Xiaofeng Wang
ac378eaaf1 使用统一的编译参数 2022-07-26 00:11:31 +08:00
Xiaofeng Wang
d850846612 cmake: 检查 target 来确认功能是否已启用 2022-07-25 13:52:26 +08:00
Xiaofeng Wang
9d3ead61de 整理 CMakeLists.txt 2022-07-25 00:22:30 +08:00
xiongziliang
266a0ca5b4 修复test_rtp触发断言的问题 2022-06-18 13:27:15 +08:00