amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

MediaSink: 修复静音音频添加逻辑bug

Browse Source
This commit is contained in:
ziyue 2021-11-10 11:46:30 +08:00
parent 817542cd0c
commit 1ce841ce42
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Common/MediaSink.cpp
View File

@ -176,8 +176,8 @@ void MediaSink::emitAllTrackReady() {
void MediaSink::onAllTrackReady_l() { void MediaSink::onAllTrackReady_l() {
//是否添加静音音频 //是否添加静音音频
GET_CONFIG(bool, addMuteAudio, General::kAddMuteAudio); GET_CONFIG(bool, add_mute_audio, General::kAddMuteAudio);
if (addMuteAudio && _track_map.find(TrackAudio) == _track_map.end()) { if (add_mute_audio) {
addMuteAudioTrack(); addMuteAudioTrack();
} }
onAllTrackReady(); onAllTrackReady();
@ -248,20 +248,25 @@ bool MuteAudioMaker::inputFrame(const Frame::Ptr &frame) {
} }
bool MediaSink::addMuteAudioTrack() { bool MediaSink::addMuteAudioTrack() {
if (_track_map.find(TrackAudio) != _track_map.end()) { GET_CONFIG(bool, enabel_audio, General::kEnableAudio);
WarnL << "audio track already existed"; if (!enabel_audio) {
return false; return false;
} }
if (_track_map.find(TrackAudio) != _track_map.end()) {
if (MediaSink::addTrack(std::make_shared<AACTrack>(makeAacConfig(MUTE_ADTS_DATA, ADTS_HEADER_LEN)))) { return false;
_mute_audio_maker = std::make_shared<MuteAudioMaker>();
_mute_audio_maker->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([this](const Frame::Ptr &frame) {
return inputFrame(frame);
}));
return true;
} }
return false; auto audio = std::make_shared<AACTrack>(makeAacConfig(MUTE_ADTS_DATA, ADTS_HEADER_LEN));
_track_map[audio->getTrackType()] = audio;
audio->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([this](const Frame::Ptr &frame) {
return onTrackFrame(frame);
}));
_mute_audio_maker = std::make_shared<MuteAudioMaker>();
_mute_audio_maker->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([this](const Frame::Ptr &frame) {
return inputFrame(frame);
}));
onTrackReady(audio);
TraceL << "mute aac track added";
return true;
} }
}//namespace mediakit }//namespace mediakit