THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

处理转码和静音发生器冲突问题： 

由于静音发生器产生的音频时间戳不连续，会导致转码出一大堆警告日志，并占用cpu
这变采用opus静音发生器来伪造rtc静音，而不是用转码：
This commit is contained in:
cqm 2022-11-17 12:43:30 +08:00
parent 2a6013a3b8
commit 09fcf769b0
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Common/MultiMediaSourceMuxer.cpp
View File

@ -122,10 +122,10 @@ MultiMediaSourceMuxer::MultiMediaSourceMuxer(const string &vhost, const string &
}
if (option.audio_transcode) {
#if defined(ENABLE_FFMPEG)
_audio_transcode = option.audio_transcode;
InfoL << "enable audio_transcode";
#else
InfoL << "without ffmpeg disable audio_transcode";
_option.audio_transcode = false;
#endif
}
#if defined(ENABLE_MP4)
@ -345,7 +345,7 @@ bool MultiMediaSourceMuxer::onTrackReady(const Track::Ptr &track) {
auto rtmp = _rtmp;
auto rtc = _rtc;
#if defined(ENABLE_FFMPEG)
if (_audio_transcode) {
if (_option.audio_transcode) {
if (track->getCodecId() == CodecAAC) {
if (rtmp) {
rtmp->addTrack(track);
@ -353,24 +353,34 @@ bool MultiMediaSourceMuxer::onTrackReady(const Track::Ptr &track) {
}
_audio_dec = nullptr;
_audio_enc = nullptr;
_opus_mute_maker = nullptr;
if (rtc) {
Track::Ptr newTrack(new OpusTrack());
GET_CONFIG(int, bitrate, General::kOpusBitrate);
newTrack->setBitRate(bitrate);
rtc->addTrack(newTrack);
rtc = nullptr;
// aac to opus
_audio_dec.reset(new FFmpegDecoder(track));
_audio_enc.reset(new FFmpegEncoder(newTrack));
_audio_dec->setOnDecode([this](const FFmpegFrame::Ptr & frame) {
_audio_enc->inputFrame(frame, false);
});
_audio_enc->setOnEncode([this](const Frame::Ptr& frame) {
// fill data to _rtc
if (_rtc && _rtc->isEnabled())
_rtc->inputFrame(frame);
});
if (!hasMuteAudio()) {
// aac to opus
_audio_dec.reset(new FFmpegDecoder(track));
_audio_enc.reset(new FFmpegEncoder(newTrack));
_audio_dec->setOnDecode([this](const FFmpegFrame::Ptr & frame) {
_audio_enc->inputFrame(frame, false);
});
_audio_enc->setOnEncode([this](const Frame::Ptr& frame) {
// fill data to _rtc
if (_rtc && _rtc->isEnabled())
_rtc->inputFrame(frame);
});
}
else {
_opus_mute_maker = std::make_shared<MuteAudioMaker>(CodecOpus);
_opus_mute_maker->addDelegate([this](const Frame::Ptr &frame) {
if (_rtc && _rtc->isEnabled())
_rtc->inputFrame(frame);
return true;
});
}
}
}
else if (track->getTrackType() == TrackAudio) {
@ -380,6 +390,7 @@ bool MultiMediaSourceMuxer::onTrackReady(const Track::Ptr &track) {
}
_audio_dec = nullptr;
_audio_enc = nullptr;
_opus_mute_maker = nullptr;
if (rtmp) {
Track::Ptr newTrack(new AACTrack(44100, std::dynamic_pointer_cast<AudioTrack>(track)->getAudioChannel()));
GET_CONFIG(int, bitrate, General::kAacBitrate);
@ -470,6 +481,7 @@ void MultiMediaSourceMuxer::resetTracks() {
#if defined(ENABLE_FFMPEG)
_audio_dec = nullptr;
_audio_dec = nullptr;
_opus_mute_maker = nullptr;
#endif
#if defined(ENABLE_MP4)
if (_fmp4) {
@ -510,7 +522,7 @@ bool MultiMediaSourceMuxer::onTrackFrame(const Frame::Ptr &frame_in) {
if (_rtmp && _rtmp->isEnabled())
rtmp = _rtmp;
#if defined(ENABLE_FFMPEG)
if (_audio_transcode) {
if (_option.audio_transcode) {
if (frame->getCodecId() == CodecAAC) {
if (rtc) {
if (_audio_dec && rtc->readerCount())
@ -524,6 +536,8 @@ bool MultiMediaSourceMuxer::onTrackFrame(const Frame::Ptr &frame_in) {
_audio_dec->inputFrame(frame, true, false, false);
rtmp = nullptr;
}
} else if (_opus_mute_maker && rtc) {
_opus_mute_maker->inputFrame(frame);
}
}
#endif

2
src/Common/MultiMediaSourceMuxer.h
View File

@ -175,7 +175,7 @@ private:
std::shared_ptr<TSMediaSourceMuxer> _ts;
std::shared_ptr<RtspMediaSourceMuxer> _rtc;
#if defined(ENABLE_FFMPEG)
bool _audio_transcode = false;
MuteAudioMaker::Ptr _opus_mute_maker;
std::shared_ptr<FFmpegDecoder> _audio_dec;
std::shared_ptr<FFmpegEncoder> _audio_enc;
#endif