4173 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ziyue	eac5a5b1dc	使用submodule方式添加jsoncpp源码	2022-10-16 21:10:18 +08:00
ziyue	8d80582f89	删除jsoncpp源码	2022-10-16 21:08:03 +08:00
ziyue	ac1abb34da	新增媒体流flush机制：#1996	2022-10-16 19:54:17 +08:00
ziyue	80eef693c6	精确mp4录制时长：#1795	2022-10-16 16:44:54 +08:00
xiongguangjie	bbdcc44eb0	mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms	2022-10-11 16:53:27 +08:00
ziyue	2b64245c14	优化代码	2022-10-08 10:47:09 +08:00
xiongziliang	c790254f46	修复关闭mp4录制不能触发无人观看事件问题：#2010	2022-10-06 13:06:54 +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
ziyue	34838b1b26	rtmp点播采用简单握手，发送心跳包，兼容fms服务器: #2007	2022-09-30 13:36:43 +08:00
xiongguangjie	bfebcd62c7	rtp packet sort set init seq	2022-09-28 15:29:11 +08:00
夏楚	69736fdb63	Merge pull request #1999 from ZLMediaKit/feature/gbsendpassive_random_port_return_immediately ... 当使用tcp被动模式并且使用随机端口时，马上返回让调用者知道端口，以便生成sdp	2022-09-26 16:16:15 +08:00
xiongguangjie	9f716dd8b8	fix gb startsendpassive use random port return immediately not wait	2022-09-26 15:50:02 +08:00
夏楚	718a18558a	Merge pull request #1993 from leo94666/master ... android webrtc player	2022-09-26 14:11:04 +08:00
夏楚	cf5527ed62	Update README.md	2022-09-26 10:32:27 +08:00
夏楚	037dd646d1	Merge pull request #1994 from Dw9/master ... 修复rtsp 推pcm L16, 空指针的异常	2022-09-26 10:27:30 +08:00
Dw9	6f1a45db8a	修复推rtsp L16崩溃	2022-09-25 12:13:09 +08:00
Dw9	9b8f2c5f3d	修复assert路径错误	2022-09-25 12:12:23 +08:00
leo94666	edf2341496	android webrtc player	2022-09-25 10:51:43 +08:00
夏楚	b9a4b3e71a	消除编译警告	2022-09-24 19:07:45 +08:00
夏楚	2f9b3e187b	Merge pull request #1984 from Dw9/master ... c api support srt server	2022-09-23 14:29:12 +08:00
xiongguangjie	c363b30360	srt optimize ack send logic ignore too many ack packet	2022-09-23 09:35:10 +08:00
Dw9	43bf7c7918	c api support srt server	2022-09-22 21:18:34 +08:00
Dw9	b782832a74	fix typo	2022-09-22 21:16:56 +08:00
xiongguangjie	02aad5d256	srt avoid ack time map memory not release	2022-09-22 19:21:14 +08:00
xiongguangjie	a74a9ec0d7	remove srt debug log	2022-09-22 12:03:53 +08:00
xiongguangjie	801f705628	fix srt ack packet packet buf length error	2022-09-22 12:00:02 +08:00
xiongguangjie	642ca4997a	add more dump	2022-09-22 01:07:10 +08:00
xiongguangjie	533f35dac4	copy srt estimated link capacity algorithm	2022-09-22 00:34:42 +08:00
xiongguangjie	ea35002be8	copy srt official packet recve rate algorithm	2022-09-21 19:21:49 +08:00
ziyue	a226794cd2	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-09-20 16:13:14 +08:00
ziyue	6fad6f591f	开启第三方mpeg库编译宏开关，兼容某些国标流	2022-09-20 16:00:13 +08:00
Xiaofeng Wang	b35d41b4b7	Merge pull request #1969 from wasphin/feature/fix-link-flags ... cmake: 修正编译链接问题	2022-09-20 11:05:57 +08:00
xiongguangjie	ec1942fa81	srt connection transfer support	2022-09-20 00:39:42 +08:00
Xiaofeng Wang	0c882d4d79	cmake: fix include directory for assert.h	2022-09-19 21:16:56 +08:00
Xiaofeng Wang	11dfcf3bdb	cmake: -Wl linking flags	2022-09-19 21:02:51 +08:00
Xiaofeng Wang	c282775205	cmake: fix linking asan	2022-09-19 21:00:48 +08:00
ziyue	b77c19c969	更新ssl证书	2022-09-18 21:13:01 +08:00
ziyue	0b355759de	整理webrtc相关代码命名空间	2022-09-18 21:03:05 +08:00
ziyue	15affeff1d	优化关闭媒体源相关逻辑: #1963	2022-09-18 20:36:47 +08:00
xiongziliang	daafe62f35	更新功能一览图	2022-09-17 23:27:42 +08:00
xiongziliang	99b8be9051	更新第三方库，兼容大华某些设备国标流	2022-09-17 09:58:52 +08:00
xiongziliang	12551be33c	提炼ProtocolOption赋值相关逻辑	2022-09-16 23:31:37 +08:00
老衲不出家	c094751f17	Merge pull request #1958 from amani-lei/patch-1 ... 使用docker buildx, 用于支持跨平台build	2022-09-14 11:06:04 +08:00
He Lei	c552d8c1bf	使用docker buildx, 用于支持跨平台build ... docker buildx build --platform=$platform --network=host --build-arg MODEL=$model -t $namespace/$packagename:$model.$version . #docker build --network=host --build-arg MODEL=$model -t $namespace/$packagename:$model.$version .	2022-09-14 10:08:18 +08:00
custompal	08789454c3	rtsp支持指定播放单一track (#1937)	2022-09-13 16:27:00 +08:00
xiongguangjie	d04a6d4355	rtc receive sr reset alive ticker	2022-09-09 23:04:28 +08:00
夏楚	098bd319ab	Android ci fixed (#1952)	2022-09-09 18:06:18 +08:00
夏楚	4a35ddbddb	Merge pull request #1942 from mtdxc/reduce_code ... 简化代码	2022-09-09 11:10:55 +08:00