From 0363c172638c9a695471f510f503d0ce09d62143 Mon Sep 17 00:00:00 2001 From: Alexandr Date: Mon, 22 May 2023 09:54:57 +0300 Subject: [PATCH] Revert "Improved vlc behavior. https://github.com/ZLMediaKit/ZLMediaKit/issues/2416#issue-1681232888" This reverts commit 60364f8995489542488ff869f42b0b86cb9541c2. --- src/Extension/H264Rtp.cpp | 4 ++-- src/Extension/H265Rtp.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Extension/H264Rtp.cpp b/src/Extension/H264Rtp.cpp index 98bd7019..f12218a4 100644 --- a/src/Extension/H264Rtp.cpp +++ b/src/Extension/H264Rtp.cpp @@ -203,8 +203,8 @@ void H264RtpEncoder::insertConfigFrame(uint64_t pts){ return; } //gop缓存从sps开始，sps、pps后面还有时间戳相同的关键帧，所以mark bit为false - packRtp(_sps->data() + _sps->prefixSize(), _sps->size() - _sps->prefixSize(), pts, false, false); - packRtp(_pps->data() + _pps->prefixSize(), _pps->size() - _pps->prefixSize(), pts, false, true); + packRtp(_sps->data() + _sps->prefixSize(), _sps->size() - _sps->prefixSize(), pts, false, true); + packRtp(_pps->data() + _pps->prefixSize(), _pps->size() - _pps->prefixSize(), pts, false, false); } void H264RtpEncoder::packRtp(const char *ptr, size_t len, uint64_t pts, bool is_mark, bool gop_pos){ diff --git a/src/Extension/H265Rtp.cpp b/src/Extension/H265Rtp.cpp index a058292f..23bbb109 100644 --- a/src/Extension/H265Rtp.cpp +++ b/src/Extension/H265Rtp.cpp @@ -316,9 +316,9 @@ void H265RtpEncoder::insertConfigFrame(uint64_t pts){ return; } //gop缓存从vps 开始，vps ,sps、pps后面还有时间戳相同的关键帧，所以mark bit为false - packRtp(_vps->data() + _vps->prefixSize(), _vps->size() - _vps->prefixSize(), pts, false, false); + packRtp(_vps->data() + _vps->prefixSize(), _vps->size() - _vps->prefixSize(), pts, false, true); packRtp(_sps->data() + _sps->prefixSize(), _sps->size() - _sps->prefixSize(), pts, false, false); - packRtp(_pps->data() + _pps->prefixSize(), _pps->size() - _pps->prefixSize(), pts, false, true); + packRtp(_pps->data() + _pps->prefixSize(), _pps->size() - _pps->prefixSize(), pts, false, false); } bool H265RtpEncoder::inputFrame_l(const Frame::Ptr &frame, bool is_mark){