amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 12:11:36 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,684 Commits 16 Branches 0 Tags 225 MiB
9bb4b55924
Commit Graph

204 Commits

Author SHA1 Message Date
xiongziliang
9bb4b55924 修复mk_media_start_send_rtp相关bug: #2044 2022-10-29 16:48:37 +08:00
ziyue
2b64245c14 优化代码 2022-10-08 10:47:09 +08:00
xiongziliang
5854a26047 修复未开启宏编译失败问题 2022-10-06 12:59:12 +08:00
xiongziliang
a916760ac3 整理webrtc c接口 2022-10-06 12:35:14 +08:00
gongluck
426d76f05c 增加通过offer获取answer的接口，不依赖http模块 
(cherry picked from commit 94d0505ea6)
 2022-10-06 12:35:02 +08:00
Dw9
43bf7c7918 c api support srt server 2022-09-22 21:18:34 +08:00
ziyue
0b355759de 整理webrtc相关代码命名空间 2022-09-18 21:03:05 +08:00
ziyue
15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
夏楚
4a35ddbddb
Merge pull request #1942 from mtdxc/reduce_code 
简化代码
 2022-09-09 11:10:55 +08:00
Mr. shengge
97320a264d
修复c sdk获取视频帧flags信息不对的问题 (#1947) 2022-09-09 11:05:42 +08:00
custompal
d853075175
RtpServer新增tcp主动模式支持 (#1938) 2022-09-09 10:56:28 +08:00
huangxiuqi
258a4dd166
C API和WebHook未找到流回调添加直接关闭机制 (#1948) 2022-09-09 10:55:35 +08:00
cqm
999e0b274e 简化代码: 
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
 2022-09-07 11:47:15 +08:00
xiongzilaing
679c79802f 整理媒体事件相关代码，删除无须重载时的多余代码逻辑 2022-08-28 17:25:56 +08:00
xiongziliang
c2ab45f78d 完善线程安全设计 2022-08-27 10:17:06 +08:00
ziyue
208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 2022-08-23 14:11:32 +08:00
xiongziliang
c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 2022-08-20 13:16:25 +08:00
ziyue
9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
Xiaofeng Wang
1491770dba 生成的文件放到当前模块的目录下 2022-08-03 22:31:52 +08:00
明月惊鹊
5e317b1914
API目录支持安卓编译，输出libmk_api.a (#1854) 
* API目录支持安卓编译，输出libmk_api.a

* API目录支持安卓编译，输出libmk_api.a[参考 wasphin大佬的指导改进了一些地方]

* update ndk version

Co-authored-by: 夏楚 <771730766@qq.com>
 2022-08-03 20:57:16 +08:00
ziyue
2bd52fa93d 隐藏c sdk中webrtc相关代码 2022-08-01 17:27:34 +08:00
夏楚
76df34de81
Merge pull request #1825 from wasphin/feature/cmake 
整理 CMakeLists.txt
 2022-07-28 14:27:44 +08:00
Xiaofeng Wang
9d3ead61de 整理 CMakeLists.txt 2022-07-25 00:22:30 +08:00
Dw9
40099df3c0 c api支持从mp4推送rtp 2022-07-24 08:51:11 +08:00
Dw9
c4988e7cfc 修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 ) 2022-07-07 16:56:54 +08:00
baiyfcu
fde6b436cc 封装rtp server创建和关闭 2022-06-22 10:31:53 +08:00
xiongziliang
f6b4eb418f 优化录制相关代码 2022-06-11 14:18:55 +08:00
xiongziliang
4f05aef245 兼容一些老的c编译器: #1668 2022-05-29 21:30:06 +08:00
xiongziliang
0c5b3f87e5 优化cmake 2022-05-28 09:48:19 +08:00
baiyfcu
4e57416be9 修复cmake generate export 和 test工程先后变编译错误问题 2022-05-27 17:03:49 +08:00
夏楚
e2908e9775
cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) 
* 解决msvc下链接问题
* CMAKE添加自动生成mk api export头文件
* 兼容非cmake构建时情况

Co-authored-by: baiyfcu <baiyfcu@gmail.com>
 2022-05-26 20:30:43 +08:00
ziyue
989e7b2e75 解决msvc下编译问题 2022-05-26 11:59:19 +08:00
ziyue
59ff0a9a1a 添加utf-8 bom头，解决msvc下编译问题 2022-05-26 11:00:48 +08:00
ziyue
d79178d116 解决msvc下编译问题 2022-05-26 10:49:44 +08:00
ziyue
5f3a46d611 FFmpeg未找到时，忽略player_opencv用例 2022-05-25 16:06:30 +08:00
ziyue
cb0e5c6c57 全面更新整理c sdk 2022-05-25 15:51:24 +08:00
ziyue
d037acbf62 完善ipv6支持 2022-05-08 17:06:10 +08:00
Dw9
67bb53746e
Update CMakeLists.txt 2022-04-19 18:07:03 +08:00
Dw9
c82cc587c8
fix typo (#1578) 
fix typo
 2022-04-18 11:48:56 +08:00
Dw9
ebe4141026
c api和测试范例新增webrtc功能 (#1574) 
* Update Rtsp.cpp

* c sdk识别到enable_webrtc

* mk_api增加json库

* 对rtc http请求的处理

* c sdk 增加rtc服务器
 2022-04-16 15:57:02 +08:00
xiongziliang
2818e371b8 完善startSendRtp接口 2022-04-03 18:37:22 +08:00
xiongziliang
94282d240e 修复编译问题 2022-03-12 20:27:22 +08:00
xiongziliang
490656ec3e 去除mk_media_init_mute_audio接口 2022-03-12 14:33:05 +08:00
xiongziliang
4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
xiongziliang
1b663e43ac 修复测试范例输入aac数据相关bug 2022-03-12 09:32:36 +08:00
ziyue
5c6dcd041f 修复c api日志路径设置可能出错的问题 2022-02-24 11:30:19 +08:00
mtdxc
af08b58d29
cmake项目分组 (#1431) 
重要项目(toolkit和mediakit)增加目录显示
 2022-02-17 10:33:42 +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
ziyue
88dc8d0a73 重写http客户端异常处理机制 2022-01-20 15:17:19 +08:00
ziyue
ee6ad66a6d HTTP: 重写http相关超时管理机制 2022-01-19 22:50:44 +08:00