Commit Graph

21 Commits

Author SHA1 Message Date
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
yujitai
6889afbc76
修复弱网丢包场景下rtp解码器可能不会输出配置帧的问题 (#3818)
在弱网丢包场景下,rtp解码器很可能进入gop dropped状态,需要等到idr到来才能继续输出帧,
这会导致idr前面的sps/pps无法被输出, 进而可能导致播放器渲染失败
2024-08-14 20:11:24 +08:00
xia-chu
9463d1291d 修复编译警告 2024-07-21 19:47:36 +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
xiongziliang
2ead272187 修复webrtc播放时生成config rtp线程安全的bug
rtsp直接代理时会从config frame生成rtp,在获取VideoTrack配置帧列表时存在线程安全风险;
同时简化getConfigFrames函数代码,去除缓存逻辑。
2024-06-22 13:04:06 +08:00
xiongguangjie
9106dde23e
g711 rtp encoder rtp mark set false compitable for freeswitch (#3647) 2024-06-19 18:42:06 +08:00
Xiaofeng Wang
efc683228c
修复H264/H265创建config帧异常问题(#3643)
https://github.com/ZLMediaKit/ZLMediaKit/pull/3611#issuecomment-2177535917
2024-06-19 14:05:23 +08:00
Xiaofeng Wang
84dbe4b076
Send config frames once before sending DirectProxy RTP packets (#3611) 2024-06-16 09:37:33 +08:00
xiongziliang
3de2ee7a2b 优化aac rtp解码器内存安全限定 2024-06-16 09:34:39 +08:00
xiongziliang
720d6304d2 修复aac rtp解码兼容性相关bug 2024-06-15 15:11:36 +08:00
chdahuzi
15bc4c8767
解决帧率解析错误问题 (#3607)
有时解析H265的sps,帧率会出错,例如QgEBAWAAAAMAAAMAAAMAAAMAlqABQCAFof4qtO6JLuaAgAg9YADN/mAE
帧率会解析成3971
2024-06-09 10:43:32 +08:00
xiongguangjie
4aa330ab82
rtp g711 encoder rtp not key pos avoid gop cache useless (#3476)
g711 rtp encoder input packet not key pos , avoid gop cache useless, fix
the bug
2024-04-16 22:34:54 +08:00
xia-chu
f5ca61d235 Enhance compatibility with non-compliant RTMP AAC streams 2024-03-22 20:50:07 +08:00
xia-chu
49ddde28c0 Refactor code 2024-03-22 20:50:07 +08:00
johzzy
2f50344e7b
Add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services (#3337) 2024-03-10 16:31:20 +08:00
xiongguangjie
06abbd0eb7
rtp send rtp g711 audio can config duration (#3325)
optimization for this
[issue](https://github.com/ZLMediaKit/ZLMediaKit/issues/3316)
2024-03-02 16:40:13 +08:00
imp_rayjay
87cb488b04
Added support for DRI frames in MJPEG RTP packetization (#3305) 2024-02-19 11:54:13 +08:00
xiongziliang
dfda93a4c4 Ignore invalid H264/H265 rtmp packet instead of throwing an error 2024-01-15 20:32:06 +08:00
PioLing
2f4cd67162
修正 getCodecU 返回值 (#3104)
'g711 getCodecU() 返回值改为 CodecG711U'
2023-12-11 16:24:54 +08:00
Xiaofeng Wang
33f860fd04 Fix A -> U 2023-12-11 11:05:55 +08:00
xia-chu
25c99470ee feat: add support of codec plugin 2023-12-10 11:09:04 +08:00