From 878a442b949cb162cec5ab7e6b6dee39de14b8f4 Mon Sep 17 00:00:00 2001 From: xia-chu <771730766@qq.com> Date: Sat, 9 Dec 2023 17:24:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Record/MP4Demuxer.cpp | 10 +++++----- src/Record/MP4Demuxer.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Record/MP4Demuxer.cpp b/src/Record/MP4Demuxer.cpp index deefbba6..4d6800d2 100644 --- a/src/Record/MP4Demuxer.cpp +++ b/src/Record/MP4Demuxer.cpp @@ -62,7 +62,7 @@ void MP4Demuxer::onVideoTrack(uint32_t track, uint8_t object, int width, int hei return; } video->setIndex(track); - _track_to_codec.emplace(track, video); + _tracks.emplace(track, video); if (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; } audio->setIndex(track); - _track_to_codec.emplace(track, audio); + _tracks.emplace(track, audio); if (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) { - auto it = _track_to_codec.find(track_id); - if (it == _track_to_codec.end()) { + auto it = _tracks.find(track_id); + if (it == _tracks.end()) { return nullptr; } Frame::Ptr ret; @@ -176,7 +176,7 @@ Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int6 vector MP4Demuxer::getTracks(bool ready) const { vector ret; - for (auto &pr : _track_to_codec) { + for (auto &pr : _tracks) { if (ready && !pr.second->ready()) { continue; } diff --git a/src/Record/MP4Demuxer.h b/src/Record/MP4Demuxer.h index 7cc65197..889f91fc 100644 --- a/src/Record/MP4Demuxer.h +++ b/src/Record/MP4Demuxer.h @@ -71,7 +71,7 @@ private: MP4FileDisk::Ptr _mp4_file; MP4FileDisk::Reader _mov_reader; uint64_t _duration_ms = 0; - std::unordered_map _track_to_codec; + std::unordered_map _tracks; toolkit::ResourcePool _buffer_pool; };