From e461cfd882c2aeaa6d1e51d16c2da5020365af19 Mon Sep 17 00:00:00 2001 From: xia-chu <771730766@qq.com> Date: Sat, 9 Dec 2023 09:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/source/mk_frame.cpp | 4 +- src/Extension/AAC.cpp | 3 +- src/Extension/Factory.cpp | 15 ++--- src/Extension/Factory.h | 2 +- src/Extension/Frame.h | 125 +++++++++++++++++++------------------- src/Extension/JPEG.h | 30 ++++----- src/Extension/JPEGRtp.cpp | 11 ++-- src/Record/MP4Demuxer.cpp | 4 +- 8 files changed, 92 insertions(+), 102 deletions(-) diff --git a/api/source/mk_frame.cpp b/api/source/mk_frame.cpp index 9658134a..b332a3c4 100644 --- a/api/source/mk_frame.cpp +++ b/api/source/mk_frame.cpp @@ -77,10 +77,10 @@ static mk_frame mk_frame_create_complex(int codec_id, uint64_t dts, uint64_t pts switch (codec_id) { case CodecH264: return (mk_frame)new Frame::Ptr(new H264FrameHelper( - cb, frame_flags, cb, std::move(user_data), (CodecId)codec_id, data, size, dts, pts, prefix_size)); + cb, frame_flags, cb, std::move(user_data), data, size, dts, pts, prefix_size)); case CodecH265: return (mk_frame)new Frame::Ptr(new H265FrameHelper( - cb, frame_flags, cb, std::move(user_data), (CodecId)codec_id, data, size, dts, pts, prefix_size)); + cb, frame_flags, cb, std::move(user_data), data, size, dts, pts, prefix_size)); default: return (mk_frame)new Frame::Ptr(new FrameFromPtrForC( cb, frame_flags, cb, std::move(user_data), (CodecId)codec_id, data, size, dts, pts, prefix_size)); diff --git a/src/Extension/AAC.cpp b/src/Extension/AAC.cpp index 38db7c36..01774b8b 100644 --- a/src/Extension/AAC.cpp +++ b/src/Extension/AAC.cpp @@ -298,14 +298,13 @@ bool AACTrack::inputFrame(const Frame::Ptr &frame) { if (frame_len == (int)frame->size()) { return inputFrame_l(frame); } - auto sub_frame = std::make_shared>(frame, (char *)ptr, frame_len, ADTS_HEADER_LEN, dts, pts); + auto sub_frame = std::make_shared>(frame, (char *)ptr, frame_len, dts, pts, ADTS_HEADER_LEN); ptr += frame_len; if (ptr > end) { WarnL << "invalid aac length in adts header: " << frame_len << ", remain data size: " << end - (ptr - frame_len); break; } - sub_frame->setCodecId(CodecAAC); if (inputFrame_l(sub_frame)) { ret = true; } diff --git a/src/Extension/Factory.cpp b/src/Extension/Factory.cpp index 8a1339eb..4e4b06d4 100644 --- a/src/Extension/Factory.cpp +++ b/src/Extension/Factory.cpp @@ -307,6 +307,7 @@ Frame::Ptr Factory::getFrameFromPtr(CodecId codec, const char *data, size_t byte switch (codec) { case CodecH264: return std::make_shared((char *)data, bytes, dts, pts, prefixSize(data, bytes)); case CodecH265: return std::make_shared((char *)data, bytes, dts, pts, prefixSize(data, bytes)); + case CodecJPEG: return std::make_shared>(0, codec, (char *)data, bytes, dts, pts); case CodecAAC: return std::make_shared(codec, (char *)data, bytes, dts, pts, aacPrefixSize(data, bytes)); case CodecOpus: case CodecG711A: @@ -315,17 +316,9 @@ Frame::Ptr Factory::getFrameFromPtr(CodecId codec, const char *data, size_t byte } } -Frame::Ptr Factory::getFrameFromBuffer(CodecId codec, const Buffer::Ptr &data, uint64_t dts, uint64_t pts) { - switch (codec) { - case CodecH264: return std::make_shared>(data, dts, pts, prefixSize(data->data(), data->size()), 0); - case CodecH265: return std::make_shared>(data, dts, pts, prefixSize(data->data(), data->size()), 0); - case CodecJPEG: return std::make_shared(data, dts); - case CodecAAC: return std::make_shared>(data, dts, pts, aacPrefixSize(data->data(), data->size()), 0, codec); - case CodecOpus: - case CodecG711A: - case CodecG711U: return std::make_shared>(data, dts, pts, 0, 0, codec); - default: return nullptr; - } +Frame::Ptr Factory::getFrameFromBuffer(CodecId codec, Buffer::Ptr data, uint64_t dts, uint64_t pts) { + auto frame = Factory::getFrameFromPtr(codec, data->data(), data->size(), dts, pts); + return std::make_shared(frame, false, std::move(data)); } }//namespace mediakit diff --git a/src/Extension/Factory.h b/src/Extension/Factory.h index 09cc14b7..3662b2b6 100644 --- a/src/Extension/Factory.h +++ b/src/Extension/Factory.h @@ -88,7 +88,7 @@ public: static AMFValue getAmfByCodecId(CodecId codecId); static Frame::Ptr getFrameFromPtr(CodecId codec, const char *data, size_t size, uint64_t dts, uint64_t pts); - static Frame::Ptr getFrameFromBuffer(CodecId codec, const toolkit::Buffer::Ptr &data, uint64_t dts, uint64_t pts); + static Frame::Ptr getFrameFromBuffer(CodecId codec, toolkit::Buffer::Ptr data, uint64_t dts, uint64_t pts); }; }//namespace mediakit diff --git a/src/Extension/Frame.h b/src/Extension/Frame.h index 5dcd1005..03ced889 100644 --- a/src/Extension/Frame.h +++ b/src/Extension/Frame.h @@ -241,6 +241,54 @@ protected: FrameImp() = default; }; +// 包装一个指针成不可缓存的frame +class FrameFromPtr : public Frame { +public: + using Ptr = std::shared_ptr; + + FrameFromPtr(CodecId codec_id, char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0, bool is_key = false) + : FrameFromPtr(ptr, size, dts, pts, prefix_size, is_key) { + _codec_id = codec_id; + } + + char *data() const override { return _ptr; } + size_t size() const override { return _size; } + uint64_t dts() const override { return _dts; } + uint64_t pts() const override { return _pts ? _pts : dts(); } + size_t prefixSize() const override { return _prefix_size; } + bool cacheAble() const override { return false; } + bool keyFrame() const override { return _is_key; } + bool configFrame() const override { return false; } + + CodecId getCodecId() const override { + if (_codec_id == CodecInvalid) { + throw std::invalid_argument("Invalid codec type of FrameFromPtr"); + } + return _codec_id; + } + +protected: + FrameFromPtr() = default; + + FrameFromPtr(char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0, bool is_key = false) { + _ptr = ptr; + _size = size; + _dts = dts; + _pts = pts; + _prefix_size = prefix_size; + _is_key = is_key; + } + +protected: + bool _is_key; + char *_ptr; + uint64_t _dts; + uint64_t _pts = 0; + size_t _size; + size_t _prefix_size; + CodecId _codec_id = CodecInvalid; +}; + /** * 一个Frame类中可以有多个帧(AAC)，时间戳会变化 * ZLMediaKit会先把这种复合帧split成单个帧然后再处理 @@ -251,10 +299,11 @@ template class FrameInternalBase : public Parent { public: using Ptr = std::shared_ptr; - FrameInternalBase(Frame::Ptr parent_frame, char *ptr, size_t size, size_t prefix_size, uint64_t dts, uint64_t pts) - : Parent(ptr, size, dts, pts, prefix_size) { + FrameInternalBase(Frame::Ptr parent_frame, char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0) + : Parent(parent_frame->getCodecId(), ptr, size, dts, pts, prefix_size) { _parent_frame = std::move(parent_frame); } + bool cacheAble() const override { return _parent_frame->cacheAble(); } private: @@ -272,56 +321,7 @@ class FrameInternal : public FrameInternalBase { public: using Ptr = std::shared_ptr; FrameInternal(const Frame::Ptr &parent_frame, char *ptr, size_t size, size_t prefix_size) - : FrameInternalBase(parent_frame, ptr, size, prefix_size, parent_frame->dts(), parent_frame->pts()) {} -}; - -// 包装一个指针成不可缓存的frame -class FrameFromPtr : public Frame { -public: - using Ptr = std::shared_ptr; - - FrameFromPtr(CodecId codec_id, char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0, bool is_key = false) - : FrameFromPtr(ptr, size, dts, pts, prefix_size, is_key) { - _codec_id = codec_id; - } - - FrameFromPtr(char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0, bool is_key = false) { - _ptr = ptr; - _size = size; - _dts = dts; - _pts = pts; - _prefix_size = prefix_size; - _is_key = is_key; - } - - char *data() const override { return _ptr; } - size_t size() const override { return _size; } - uint64_t dts() const override { return _dts; } - uint64_t pts() const override { return _pts ? _pts : dts(); } - size_t prefixSize() const override { return _prefix_size; } - bool cacheAble() const override { return false; } - bool keyFrame() const override { return _is_key; } - bool configFrame() const override { return false; } - void setCodecId(CodecId codec_id) { _codec_id = codec_id; } - - CodecId getCodecId() const override { - if (_codec_id == CodecInvalid) { - throw std::invalid_argument("Invalid codec type of FrameFromPtr"); - } - return _codec_id; - } - -protected: - FrameFromPtr() = default; - -protected: - bool _is_key; - char *_ptr; - uint64_t _dts; - uint64_t _pts = 0; - size_t _size; - size_t _prefix_size; - CodecId _codec_id = CodecInvalid; + : FrameInternalBase(parent_frame, ptr, size, parent_frame->dts(), parent_frame->pts(), prefix_size) {} }; // 管理一个指针生命周期并生产一个frame @@ -352,14 +352,18 @@ class FrameCacheAble : public FrameFromPtr { public: using Ptr = std::shared_ptr; - FrameCacheAble(const Frame::Ptr &frame, bool force_key_frame = false) { + FrameCacheAble(const Frame::Ptr &frame, bool force_key_frame = false, toolkit::Buffer::Ptr buf = nullptr) { if (frame->cacheAble()) { - _frame = frame; _ptr = frame->data(); + _buffer = frame; + } else if (buf) { + _ptr = frame->data(); + _buffer = std::move(buf); } else { - _buffer = FrameImp::create(); - _buffer->_buffer.assign(frame->data(), frame->size()); - _ptr = _buffer->data(); + auto buffer = std::make_shared(); + buffer->assign(frame->data(), frame->size()); + _ptr = buffer->data(); + _buffer = std::move(buffer); } _size = frame->size(); _dts = frame->dts(); @@ -386,8 +390,7 @@ private: bool _config; bool _drop_able; bool _decode_able; - Frame::Ptr _frame; - FrameImp::Ptr _buffer; + toolkit::Buffer::Ptr _buffer; }; //该类实现frame级别的时间戳覆盖 @@ -429,7 +432,7 @@ public: * @param prefix 帧前缀长度 * @param offset buffer有效数据偏移量 */ - FrameFromBuffer(toolkit::Buffer::Ptr buf, uint64_t dts, uint64_t pts, size_t prefix, size_t offset) + FrameFromBuffer(toolkit::Buffer::Ptr buf, uint64_t dts, uint64_t pts, size_t prefix = 0, size_t offset = 0) : Parent(buf->data() + offset, buf->size() - offset, dts, pts, prefix) { _buf = std::move(buf); } @@ -443,7 +446,7 @@ public: * @param offset buffer有效数据偏移量 * @param codec 帧类型 */ - FrameFromBuffer(toolkit::Buffer::Ptr buf, uint64_t dts, uint64_t pts, size_t prefix, size_t offset, CodecId codec) + FrameFromBuffer(CodecId codec, toolkit::Buffer::Ptr buf, uint64_t dts, uint64_t pts, size_t prefix = 0, size_t offset = 0) : Parent(codec, buf->data() + offset, buf->size() - offset, dts, pts, prefix) { _buf = std::move(buf); } diff --git a/src/Extension/JPEG.h b/src/Extension/JPEG.h index d9e6006d..797bc22b 100644 --- a/src/Extension/JPEG.h +++ b/src/Extension/JPEG.h @@ -29,40 +29,34 @@ private: uint64_t _tmp = 0; }; -class JPEGFrame : public Frame { +class JPEGFrameType { +public: + virtual ~JPEGFrameType() = default; + virtual uint8_t pixType() const = 0; +}; + +template +class JPEGFrame : public Parent, public JPEGFrameType { public: static constexpr auto kJFIFSize = 20u; /** * JPEG/MJPEG帧 - * @param buffer 帧数据 - * @param dts 时间戳,单位毫秒 * @param pix_type pixel format type; AV_PIX_FMT_YUVJ422P || (AVCOL_RANGE_JPEG && AV_PIX_FMT_YUV422P) : 1; AV_PIX_FMT_YUVJ420P || (AVCOL_RANGE_JPEG && AV_PIX_FMT_YUV420P) : 0 - * @param offset buffer有效帧数据偏移量 */ - JPEGFrame(toolkit::Buffer::Ptr buffer, uint64_t dts, uint8_t pix_type = 0, size_t offset = 0) { - _buffer = std::move(buffer); - _dts = dts; + template + JPEGFrame(uint8_t pix_type, ARGS &&...args) : Parent(std::forward(args)...) { _pix_type = pix_type; - _offset = offset; // JFIF头固定20个字节长度 - CHECK(_buffer->size() > _offset + kJFIFSize); + CHECK(this->size() > kJFIFSize); } - uint64_t dts() const override { return _dts; } size_t prefixSize() const override { return 0; } bool keyFrame() const override { return true; } bool configFrame() const override { return false; } CodecId getCodecId() const override { return CodecJPEG; } - - char *data() const override { return _buffer->data() + _offset; } - size_t size() const override { return _buffer->size() - _offset; } - - uint8_t pixType() const { return _pix_type; } + uint8_t pixType() const override { return _pix_type; } private: uint8_t _pix_type; - size_t _offset; - uint64_t _dts; - toolkit::Buffer::Ptr _buffer; }; }//namespace mediakit diff --git a/src/Extension/JPEGRtp.cpp b/src/Extension/JPEGRtp.cpp index c4fa1854..7d1ae084 100644 --- a/src/Extension/JPEGRtp.cpp +++ b/src/Extension/JPEGRtp.cpp @@ -788,6 +788,8 @@ JPEGRtpDecoder::JPEGRtpDecoder() { memset(&_ctx.timestamp, 0, sizeof(_ctx) - offsetof(decltype(_ctx), timestamp)); } +using JPEGFrameImp = JPEGFrame >; + bool JPEGRtpDecoder::inputRtp(const RtpPacket::Ptr &rtp, bool) { auto payload = rtp->getPayload(); auto size = rtp->getPayloadSize(); @@ -802,8 +804,7 @@ bool JPEGRtpDecoder::inputRtp(const RtpPacket::Ptr &rtp, bool) { uint8_t type; if (0 == jpeg_parse_packet(nullptr, &_ctx, &stamp, payload, size, seq, marker ? RTP_FLAG_MARKER : 0, &type)) { auto buffer = std::make_shared(std::move(_ctx.frame)); - // JFIF头固定20个字节长度 - auto frame = std::make_shared(std::move(buffer), stamp / 90, type); + auto frame = std::make_shared(type, std::move(buffer), stamp / 90, 0); _ctx.frame.clear(); RtpCodec::inputFrame(std::move(frame)); } @@ -815,11 +816,11 @@ bool JPEGRtpDecoder::inputRtp(const RtpPacket::Ptr &rtp, bool) { bool JPEGRtpEncoder::inputFrame(const Frame::Ptr &frame) { // JFIF头固定20个字节长度 - auto ptr = (uint8_t *)frame->data() + frame->prefixSize() + JPEGFrame::kJFIFSize; - auto len = frame->size() - frame->prefixSize() - JPEGFrame::kJFIFSize; + auto ptr = (uint8_t *)frame->data() + frame->prefixSize() + JPEGFrameImp::kJFIFSize; + auto len = frame->size() - frame->prefixSize() - JPEGFrameImp::kJFIFSize; auto pts = frame->pts(); auto type = 1; - auto jpeg = dynamic_pointer_cast(frame); + auto jpeg = dynamic_pointer_cast(frame); if (jpeg) { type = jpeg->pixType(); } diff --git a/src/Record/MP4Demuxer.cpp b/src/Record/MP4Demuxer.cpp index 398b2815..9b674924 100644 --- a/src/Record/MP4Demuxer.cpp +++ b/src/Record/MP4Demuxer.cpp @@ -155,12 +155,12 @@ Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int6 memcpy(data + offset, "\x00\x00\x00\x01", 4); offset += (frame_len + 4); } - ret = Factory::getFrameFromBuffer(codec, buf, dts, pts); + ret = Factory::getFrameFromBuffer(codec, std::move(buf), dts, pts); break; } default: { - ret = Factory::getFrameFromBuffer(codec, buf, dts, pts); + ret = Factory::getFrameFromBuffer(codec, std::move(buf), dts, pts); break; } }