93 Commits

Author	SHA1	Message	Date
baiyfcu	8b6394d43d	Merge pull request #19 from xia-chu/master ... update	2020-09-22 17:20:22 +08:00
xiongziliang	416d21df36	返回值去除std::move	2020-09-21 14:32:56 +08:00
xiongziliang	adb3be70d0	添加GB28181相关c api: #491	2020-09-20 21:23:33 +08:00
xiongziliang	f84981dc75	合并pr(添加录制ts完成通知): #479	2020-09-20 11:40:42 +08:00
xiongziliang	0fce108de5	Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr	2020-09-20 11:01:45 +08:00
xiongziliang	9c873e1d19	去除转协议开关参数	2020-09-20 09:26:00 +08:00
wxf	748bb8e488	统一 mp4 及 ts 录像信息定义	2020-09-15 19:09:26 +08:00
xiongziliang	9e26a02fb1	实现rtsp/rtmp按需转协议功能	2020-09-12 19:09:56 +08:00
xiongziliang	a22f97c777	rtsp/rtmp/mp4支持opus并整理代码	2020-08-01 10:22:12 +08:00
xiongziliang	fdbed9e83b	兼容一些不规范的rtmp流	2020-08-01 10:17:54 +08:00
baiyfcu	90bbdf95a9	Merge pull request #18 from xiongziliang/master ... update	2020-07-20 11:37:23 +08:00
xiongziliang	b603b8a68d	支持http api动态添加或关闭rtp服务器	2020-07-02 22:23:43 +08:00
xiongziliang	3c858a8351	添加媒体注册回调事件:#373	2020-07-02 18:14:39 +08:00
xiongziliang	e89caa2385	c sdk支持pcm输入:#363	2020-06-24 11:18:04 +08:00
zhlong	3d25ede46f	为API添加获取配置型内容的接口	2020-06-24 09:50:35 +08:00
lyg1949	f0a538d37d	实现输入PCM帧的接口 ... 实现输入PCM帧的接口	2020-06-24 08:54:15 +08:00
baiyfcu	a46218965a	Merge pull request #17 from xiongziliang/master ... update	2020-06-17 15:58:41 +08:00
xiongziliang	09995a7ed8	完善websocket c api	2020-06-04 16:17:03 +08:00
xiongziliang	683c8eef15	添加获取线程的方法	2020-05-08 09:52:05 +08:00
baiyfcu	6518e5d448	Merge pull request #16 from xiongziliang/master ... update	2020-04-29 18:26:06 +08:00
xiongziliang	aa9bd56c5a	回调可以设置空指针	2020-04-27 09:18:46 +08:00
baiyfcu	7490f320f8	Merge pull request #15 from xiongziliang/master ... update	2020-04-26 22:35:29 +08:00
xiongziliang	7272f01ea9	确保能同步取消定时器	2020-04-26 19:36:17 +08:00
xiongziliang	341bb5d84a	确保定时器能同步取消	2020-04-26 19:34:58 +08:00
xiongziliang	3651609a5f	确保mk_player_release后不再触发回调	2020-04-26 19:09:38 +08:00
xiongziliang	e141eeb8b8	同步取消回调	2020-04-26 19:02:40 +08:00
baiyfcu	98d0bc27f9	mk_player api 增加seek和获取进度以相对开始时间的接口以适应按时间轴方式回放的需求	2020-04-26 17:40:34 +08:00
xiongziliang	bda57b57f2	修复内存失效的问题	2020-04-24 14:06:28 +08:00
xiongziliang	eda7a59f3c	统一事件参数类型	2020-04-23 22:04:59 +08:00
xiongziliang	b6946a5968	事件广播触发者改成SockInfo对象	2020-04-23 21:38:44 +08:00
xiongziliang	4d84661a87	更新ZLToolKit	2020-04-23 17:50:12 +08:00
xiongziliang	8859e89ade	完善 c api	2020-04-22 09:51:04 +08:00
xiongziliang	1d5c6cb141	整理解析器	2020-04-20 18:13:45 +08:00
xiongziliang	003cd58371	完善接口	2020-04-19 00:05:02 +08:00
xiongziliang	49596bd97f	简化接口	2020-04-18 23:56:27 +08:00
xiongziliang	5c3418a412	合并 #278	2020-04-18 18:46:20 +08:00
baiyfcu	40afa204d5	增加rtmp/rtsp对音频G711A,G711U的支持	2020-04-17 17:47:10 +08:00
baiyfcu	340629cdc6	添加对g711A/U rtsp支持相关文件，api添加windows静态库编译选项，g711 RTMP支持尚未修改	2020-04-08 15:42:52 +08:00
xiongziliang	e5d5cabf89	部分恢复录制相关接口	2020-04-05 09:26:29 +08:00
xiongziliang	7019e4717c	整理授权协议	2020-04-04 20:30:09 +08:00
xiongziliang	cefb2a7cc4	hls/mp4录制不再能随时开启或关闭	2020-04-04 14:33:12 +08:00
xiongziliang	523a8d0527	消除编译警告	2020-04-03 22:19:04 +08:00
xiongziliang	40a7b5b5b4	防止未赋值导致崩溃的问题	2020-04-02 10:35:10 +08:00
xiongziliang	651d0da14a	防止未赋值导致崩溃的问题	2020-04-02 10:34:25 +08:00
xiongziliang	f1914ca67f	优化事件触发器性能	2020-04-02 10:32:16 +08:00
xiongziliang	ace200716a	修复无人播放事件触发延时不准确的bug	2020-03-23 10:21:17 +08:00
xiongziliang	1168174c2b	tab统一替换为4个空格键：#242	2020-03-20 11:51:24 +08:00
xiongziliang	891b86e7ea	新增拉流代理源相关api	2020-03-10 22:55:19 +08:00
xiongziliang	d35f1d0bfe	优化接口命名	2020-03-06 11:11:27 +08:00
xiongziliang	a89e81d3f3	完善日志	2020-03-05 18:04:34 +08:00