THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

统一命名

This commit is contained in:
xia-chu 2023-12-09 17:24:17 +08:00
parent 92589f4cda
commit 878a442b94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Record/MP4Demuxer.cpp
View File

@ -62,7 +62,7 @@ void MP4Demuxer::onVideoTrack(uint32_t track, uint8_t object, int width, int hei
return; return;
} }
video->setIndex(track); video->setIndex(track);
_track_to_codec.emplace(track, video); _tracks.emplace(track, video);
if (extra && bytes) { if (extra && bytes) {
video->setExtraData((uint8_t *)extra, bytes); video->setExtraData((uint8_t *)extra, bytes);
} }
@ -74,7 +74,7 @@ void MP4Demuxer::onAudioTrack(uint32_t track, uint8_t object, int channel_count,
return; return;
} }
audio->setIndex(track); audio->setIndex(track);
_track_to_codec.emplace(track, audio); _tracks.emplace(track, audio);
if (extra && bytes) { if (extra && bytes) {
audio->setExtraData((uint8_t *)extra, bytes); audio->setExtraData((uint8_t *)extra, bytes);
} }
@ -136,8 +136,8 @@ Frame::Ptr MP4Demuxer::readFrame(bool &keyFrame, bool &eof) {
} }
Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int64_t pts, int64_t dts) { Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int64_t pts, int64_t dts) {
auto it = _track_to_codec.find(track_id); auto it = _tracks.find(track_id);
if (it == _track_to_codec.end()) { if (it == _tracks.end()) {
return nullptr; return nullptr;
} }
Frame::Ptr ret; Frame::Ptr ret;
@ -176,7 +176,7 @@ Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int6
vector<Track::Ptr> MP4Demuxer::getTracks(bool ready) const { vector<Track::Ptr> MP4Demuxer::getTracks(bool ready) const {
vector<Track::Ptr> ret; vector<Track::Ptr> ret;
for (auto &pr : _track_to_codec) { for (auto &pr : _tracks) {
if (ready && !pr.second->ready()) { if (ready && !pr.second->ready()) {
continue; continue;
} }

2
src/Record/MP4Demuxer.h
View File

@ -71,7 +71,7 @@ private:
MP4FileDisk::Ptr _mp4_file; MP4FileDisk::Ptr _mp4_file;
MP4FileDisk::Reader _mov_reader; MP4FileDisk::Reader _mov_reader;
uint64_t _duration_ms = 0; uint64_t _duration_ms = 0;
std::unordered_map<int, Track::Ptr> _track_to_codec; std::unordered_map<int, Track::Ptr> _tracks;
toolkit::ResourcePool<toolkit::BufferRaw> _buffer_pool; toolkit::ResourcePool<toolkit::BufferRaw> _buffer_pool;
}; };