Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rtp推流增加PCM音频的处理 #3419

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

rtp推流增加PCM音频的处理 #3419

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e157c
打包mjepg rtp的时候增加支持DRI(原先只在解包的时候支持,打包的时候并不支持)
rayjay214 Feb 19, 2024
a33c1d5
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit
rayjay214 Mar 28, 2024
6119ac9
rtp推流增加PCM音频的处理
rayjay214 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/Rtp/GB28181Process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,16 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
break;
}
case Rtsp::PT_L16_Mono: {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PT_L16_Mono 好像是44100的采样率，你这里固定为16000 是不是有问题？

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是的，这里没注意，因为之前我们这边固件端推PCM的时候，pt采用的是自定义的97，采样率也是固定的16000，我当时就这样写了，case也用的是97。后来在pr里面就借用zlm里面已有的一个枚举值L16_Mono放在case分支里了

//L16
ref = std::make_shared<RtpReceiverImp>(16000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
auto track = Factory::getTrackByCodecId(CodecL16, 16000, 1, 16);
CHECK(track);
track->setIndex(pt);
_interface->addTrack(track);
_rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
break;
}
default: {
if (pt == opus_pt) {
// opus负载
Expand Down