amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fixed issue #2874, thanks quxiaohui-debug

Browse Source
This commit is contained in:
cqm 2023-10-16 09:32:26 +08:00
parent 75a3132964
commit 9bf48567b2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/RtcMediaSource.cpp
View File

@ -89,7 +89,7 @@ bool RtcMediaSourceMuxer::inputFrame(const Frame::Ptr &frame)
addTrack(track); addTrack(track);
if (!_audio_dec) return false; if (!_audio_dec) return false;
} }
if (readerCount()) { if (readerCount() || !_regist) {
_audio_dec->inputFrame(frame, true, false); _audio_dec->inputFrame(frame, true, false);
if (!_count) if (!_count)
InfoL << "start transcode " << frame->getCodecName() << "," << frame->pts() << "->Opus"; InfoL << "start transcode " << frame->getCodecName() << "," << frame->pts() << "->Opus";
@ -108,6 +108,11 @@ bool RtcMediaSourceMuxer::inputFrame(const Frame::Ptr &frame)
} }
#if defined(ENABLE_FFMPEG) #if defined(ENABLE_FFMPEG)
void RtcMediaSourceMuxer::onRegist(MediaSource &sender, bool regist)
{
MediaSourceEventInterceptor::onRegist(sender, regist);
_regist = regist;
}
bool RtcMediaSourceMuxer::addTrack(const Track::Ptr & track) bool RtcMediaSourceMuxer::addTrack(const Track::Ptr & track)
{ {

2
webrtc/RtcMediaSource.h
View File

@ -46,11 +46,13 @@ public:
#if defined(ENABLE_FFMPEG) #if defined(ENABLE_FFMPEG)
~RtcMediaSourceMuxer() override{resetTracks();} ~RtcMediaSourceMuxer() override{resetTracks();}
void onRegist(MediaSource &sender, bool regist) override;
bool addTrack(const Track::Ptr & track) override; bool addTrack(const Track::Ptr & track) override;
void resetTracks() override; void resetTracks() override;
private: private:
int _count = 0; int _count = 0;
bool _regist = false;
std::shared_ptr<FFmpegDecoder> _audio_dec; std::shared_ptr<FFmpegDecoder> _audio_dec;
std::shared_ptr<FFmpegEncoder> _audio_enc; std::shared_ptr<FFmpegEncoder> _audio_enc;
#endif #endif