mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-22 01:27:50 +08:00
Compare commits
No commits in common. "17a43e6007578c16611fb5478df700c4c2bc879a" and "57fede95085aff34f43caf3de4c1e843c6f09634" have entirely different histories.
17a43e6007
...
57fede9508
@ -1 +1 @@
|
||||
Subproject commit b3ca2f7f57ac16bc91d763bb4257225cc9abbbd4
|
||||
Subproject commit 8f25d13f49e016858fae88f1045786ce26611873
|
||||
@ -218,10 +218,7 @@ void MultiMP4Demuxer::openMP4(const string &files_string) {
|
||||
CHECK(!_demuxers.empty());
|
||||
_it = _demuxers.begin();
|
||||
for (auto &track : _it->second->getTracks(false)) {
|
||||
auto clone_track(track->clone());
|
||||
clone_track->setIndex(clone_track->getTrackType());
|
||||
_tracks.emplace(clone_track->getIndex(), clone_track);
|
||||
DebugL << "track index: " << track->getIndex() << " -> " << clone_track->getIndex();
|
||||
_tracks.emplace(track->getIndex(), track->clone());
|
||||
}
|
||||
}
|
||||
|
||||
@ -247,7 +244,6 @@ Frame::Ptr MultiMP4Demuxer::readFrame(bool &keyFrame, bool &eof) {
|
||||
for (;;) {
|
||||
auto ret = _it->second->readFrame(keyFrame, eof);
|
||||
if (ret) {
|
||||
ret->setIndex(ret->getTrackType());
|
||||
auto it = _tracks.find(ret->getIndex());
|
||||
if (it != _tracks.end()) {
|
||||
auto ret2 = std::make_shared<FrameStamp>(ret);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user