From 46a3e696d03110fbb167e862ff6b597c8a114fe1 Mon Sep 17 00:00:00 2001
From: Jonatan Samuelsson <jonatan.samuelsson@divideon.com>
Date: Tue, 5 May 2020 09:56:59 +0200
Subject: [PATCH] Using a single if condition for
pcPPS->getNoPicPartitionFlag()
---
source/Lib/DecoderLib/VLCReader.cpp | 39 ++++++++---------------------
1 file changed, 11 insertions(+), 28 deletions(-)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 5ce2ea83f..d76edb5d6 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -858,41 +858,24 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
if (!pcPPS->getNoPicPartitionFlag())
{
READ_FLAG(uiCode, "pps_rpl_info_in_ph_flag"); pcPPS->setRplInfoInPhFlag(uiCode ? true : false);
- }
- else
- {
- pcPPS->setRplInfoInPhFlag(false);
- }
- if (!pcPPS->getNoPicPartitionFlag())
- {
READ_FLAG(uiCode, "pps_sao_info_in_ph_flag"); pcPPS->setSaoInfoInPhFlag(uiCode ? true : false);
- }
- else
- {
- pcPPS->setSaoInfoInPhFlag(false);
- }
- if (!pcPPS->getNoPicPartitionFlag())
- {
READ_FLAG(uiCode, "pps_alf_info_in_ph_flag"); pcPPS->setAlfInfoInPhFlag(uiCode ? true : false);
+ if ((pcPPS->getUseWP() || pcPPS->getWPBiPred()) && pcPPS->getRplInfoInPhFlag())
+ {
+ READ_FLAG(uiCode, "pps_wp_info_in_ph_flag"); pcPPS->setWpInfoInPhFlag(uiCode ? true : false);
+ }
+ else
+ {
+ pcPPS->setWpInfoInPhFlag(false);
+ }
+ READ_FLAG(uiCode, "pps_qp_delta_info_in_ph_flag"); pcPPS->setQpDeltaInfoInPhFlag(uiCode ? true : false);
}
else
{
+ pcPPS->setRplInfoInPhFlag(false);
+ pcPPS->setSaoInfoInPhFlag(false);
pcPPS->setAlfInfoInPhFlag(false);
- }
- if (!pcPPS->getNoPicPartitionFlag() && (pcPPS->getUseWP() || pcPPS->getWPBiPred()) && pcPPS->getRplInfoInPhFlag())
- {
- READ_FLAG(uiCode, "pps_wp_info_in_ph_flag"); pcPPS->setWpInfoInPhFlag(uiCode ? true : false);
- }
- else
- {
pcPPS->setWpInfoInPhFlag(false);
- }
- if (!pcPPS->getNoPicPartitionFlag())
- {
- READ_FLAG(uiCode, "qp_delta_info_in_ph_flag"); pcPPS->setQpDeltaInfoInPhFlag(uiCode ? true : false);
- }
- else
- {
pcPPS->setQpDeltaInfoInPhFlag(false);
}
#else
--
GitLab