Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-14 12:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

完成对enhanced rtmp videocodecid的兼容 (#2718)

Browse Source 
请查阅: https://github.com/veovera/enhanced-rtmp/issues/8
This commit is contained in:
夏楚
2023-07-29 23:03:28 +08:00
committed by GitHub
parent bd8ad2eabf
commit 5a2bf8d196
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Rtmp/RtmpDemuxer.cpp
View File

@@ -75,19 +75,13 @@ bool RtmpDemuxer::loadMetaData(const AMFValue &val) {
}
if (key == "videodatarate") {
videodatarate = val.as_integer();
_videodatarate = videodatarate * 1024;
return;
}
});
if (videocodecid) {
// 有视频
ret = true;
if (videocodecid->type() == AMF_NUMBER && videocodecid->as_integer() == (int)RtmpVideoCodec::h264) {
// https://github.com/veovera/enhanced-rtmp/issues/8
_complete_delay = true;
} else {
makeVideoTrack(*videocodecid, videodatarate * 1024);
}
makeVideoTrack(*videocodecid, videodatarate * 1024);
}
if (audiocodecid) {
// 有音频
@@ -98,7 +92,7 @@ bool RtmpDemuxer::loadMetaData(const AMFValue &val) {
WarnL << ex.what();
}
if (ret && !_complete_delay) {
if (ret) {
// metadata中存在track相关的描述，那么我们根据metadata判断有多少个track
addTrackCompleted();
}
@@ -114,14 +108,8 @@ void RtmpDemuxer::inputRtmp(const RtmpPacket::Ptr &pkt) {
case MSG_VIDEO: {
if (!_try_get_video_track) {
_try_get_video_track = true;
RtmpPacketInfo info;
auto codec_id = parseVideoRtmpPacket((uint8_t *)pkt->data(), pkt->size(), &info);
if (codec_id != CodecInvalid) {
makeVideoTrack(Factory::getTrackByCodecId(codec_id), _videodatarate);
if (_complete_delay) {
addTrackCompleted();
}
}
auto codec_id = parseVideoRtmpPacket((uint8_t *)pkt->data(), pkt->size());
makeVideoTrack(Factory::getTrackByCodecId(codec_id), 0);
}
if (_video_rtmp_decoder) {
_video_rtmp_decoder->inputRtmp(pkt);