From a6cb1e89f9d66e5712e2c74fcb0813c77a1ecf3b Mon Sep 17 00:00:00 2001
From: Jonatan Samuelsson <jonatan.samuelsson@divideon.com>
Date: Thu, 23 Jan 2020 23:46:13 +0100
Subject: [PATCH] fix for EnablePictureHeaderInSliceHeader
---
source/Lib/EncoderLib/EncGOP.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 1c00e13870..afd95951ff 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3079,11 +3079,12 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
pcPic->cs->picHeader->setPic(pcPic);
pcPic->cs->picHeader->setValid();
#if JVET_Q0775_PH_IN_SH
- if (pcPic->cs->pps->getNumSlicesInPic() > 1)
+ if (pcPic->cs->pps->getNumSlicesInPic() > 1 || m_pcCfg->getEnablePictureHeaderInSliceHeader())
{
+ pcSlice->setPictureHeaderInSliceHeader(false);
actualTotalBits += xWritePicHeader(accessUnit, pcPic->cs->picHeader);
}
- else if (m_pcCfg->getEnablePictureHeaderInSliceHeader())
+ else
{
pcSlice->setPictureHeaderInSliceHeader(true);
}
--
GitLab