mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-15 04:25:58 +08:00
Header refactor (#2115)
* 优化MultiMediaSourceMuxer头文件包含 * 将MediaSinkDelegate和Demux移到MediaSink中 * MediaSource头文件重构, 独立出PacketCache.h 精简Frame和Track的头文件 * Rtmp头文件重构 * Rtsp头文件重构 * webrtc头文件重构 * 规范.h头文件包含,并将其移到.cpp中: - 尽量不包含Common\config.h - Util\File.h - Rtsp/RtspPlayer.h - Rtmp/RtmpPlayer.h * 删除多余的Stamp.h和Base64包含
This commit is contained in:
@@ -68,87 +68,4 @@ PlayerBase::PlayerBase() {
|
||||
this->mINI::operator[](Client::kWaitTrackReady) = true;
|
||||
}
|
||||
|
||||
///////////////////////////DemuxerSink//////////////////////////////
|
||||
|
||||
void MediaSinkDelegate::setTrackListener(TrackListener *listener) {
|
||||
_listener = listener;
|
||||
}
|
||||
|
||||
bool MediaSinkDelegate::onTrackReady(const Track::Ptr &track) {
|
||||
if (_listener) {
|
||||
_listener->addTrack(track);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void MediaSinkDelegate::onAllTrackReady() {
|
||||
if (_listener) {
|
||||
_listener->addTrackCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
void MediaSinkDelegate::resetTracks() {
|
||||
MediaSink::resetTracks();
|
||||
if (_listener) {
|
||||
_listener->resetTracks();
|
||||
}
|
||||
}
|
||||
|
||||
///////////////////////////Demuxer//////////////////////////////
|
||||
|
||||
void Demuxer::setTrackListener(TrackListener *listener, bool wait_track_ready) {
|
||||
if (wait_track_ready) {
|
||||
auto sink = std::make_shared<MediaSinkDelegate>();
|
||||
sink->setTrackListener(listener);
|
||||
_sink = std::move(sink);
|
||||
}
|
||||
_listener = listener;
|
||||
}
|
||||
|
||||
bool Demuxer::addTrack(const Track::Ptr &track) {
|
||||
if (!_sink) {
|
||||
_origin_track.emplace_back(track);
|
||||
return _listener ? _listener->addTrack(track) : false;
|
||||
}
|
||||
|
||||
if (_sink->addTrack(track)) {
|
||||
track->addDelegate([this](const Frame::Ptr &frame) {
|
||||
return _sink->inputFrame(frame);
|
||||
});
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void Demuxer::addTrackCompleted() {
|
||||
if (_sink) {
|
||||
_sink->addTrackCompleted();
|
||||
} else if (_listener) {
|
||||
_listener->addTrackCompleted();
|
||||
}
|
||||
}
|
||||
|
||||
void Demuxer::resetTracks() {
|
||||
if (_sink) {
|
||||
_sink->resetTracks();
|
||||
} else if (_listener) {
|
||||
_listener->resetTracks();
|
||||
}
|
||||
}
|
||||
|
||||
vector<Track::Ptr> Demuxer::getTracks(bool ready) const {
|
||||
if (_sink) {
|
||||
return _sink->getTracks(ready);
|
||||
}
|
||||
|
||||
vector<Track::Ptr> ret;
|
||||
for (auto &track : _origin_track) {
|
||||
if (ready && !track->ready()) {
|
||||
continue;
|
||||
}
|
||||
ret.emplace_back(track);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
} /* namespace mediakit */
|
||||
|
||||
Reference in New Issue
Block a user