From 1ca81e39fee840651d15cccc1d65cad333f8685b Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 3 Apr 2020 23:03:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=AB=98H264=E7=82=B9=E6=92=AD?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Extension/H264.h | 2 +- src/Record/MP4Demuxer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Extension/H264.h b/src/Extension/H264.h index b4c71a6b..e89aa5d9 100644 --- a/src/Extension/H264.h +++ b/src/Extension/H264.h @@ -257,7 +257,7 @@ public: */ void inputFrame(const Frame::Ptr &frame) override{ int type = H264_TYPE(*((uint8_t *)frame->data() + frame->prefixSize())); - if(type == H264Frame::NAL_SPS){ + if(type == H264Frame::NAL_SPS || type == H264Frame::NAL_SEI){ //有些设备会把SPS PPS IDR帧当做一个帧打包，所以我们要split一下 bool first_frame = true; splitH264(frame->data() + frame->prefixSize(), diff --git a/src/Record/MP4Demuxer.cpp b/src/Record/MP4Demuxer.cpp index a854012d..099b83a3 100644 --- a/src/Record/MP4Demuxer.cpp +++ b/src/Record/MP4Demuxer.cpp @@ -229,12 +229,12 @@ Frame::Ptr MP4Demuxer::makeFrame(uint32_t track_id, const Buffer::Ptr &buf, int6 iOffset += (iFrameLen + 4); } if (codec == CodecH264) { - return std::make_shared >(buf, pts, dts,4); + return std::make_shared >(buf, pts, dts, 4); } - return std::make_shared >(buf, pts, dts,4); + return std::make_shared >(buf, pts, dts, 4); } case CodecAAC : - return std::make_shared > (buf, pts, dts, 0); + return std::make_shared >(buf, pts, dts, 0); default: return nullptr; }