mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-25 19:17:50 +08:00
Compare commits
2 Commits
57fede9508
...
17a43e6007
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17a43e6007 | ||
|
|
98ac328318 |
@ -1 +1 @@
|
|||||||
Subproject commit 8f25d13f49e016858fae88f1045786ce26611873
|
Subproject commit b3ca2f7f57ac16bc91d763bb4257225cc9abbbd4
|
||||||
@ -218,7 +218,10 @@ void MultiMP4Demuxer::openMP4(const string &files_string) {
|
|||||||
CHECK(!_demuxers.empty());
|
CHECK(!_demuxers.empty());
|
||||||
_it = _demuxers.begin();
|
_it = _demuxers.begin();
|
||||||
for (auto &track : _it->second->getTracks(false)) {
|
for (auto &track : _it->second->getTracks(false)) {
|
||||||
_tracks.emplace(track->getIndex(), track->clone());
|
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -244,6 +247,7 @@ Frame::Ptr MultiMP4Demuxer::readFrame(bool &keyFrame, bool &eof) {
|
|||||||
for (;;) {
|
for (;;) {
|
||||||
auto ret = _it->second->readFrame(keyFrame, eof);
|
auto ret = _it->second->readFrame(keyFrame, eof);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
ret->setIndex(ret->getTrackType());
|
||||||
auto it = _tracks.find(ret->getIndex());
|
auto it = _tracks.find(ret->getIndex());
|
||||||
if (it != _tracks.end()) {
|
if (it != _tracks.end()) {
|
||||||
auto ret2 = std::make_shared<FrameStamp>(ret);
|
auto ret2 = std::make_shared<FrameStamp>(ret);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user