From bd6a0c40d146bff587c0eb19d98696c2dce2bc50 Mon Sep 17 00:00:00 2001
From: vdrugeon <virginie.drugeon@eu.panasonic.com>
Date: Mon, 11 May 2020 10:23:34 +0000
Subject: [PATCH] Fixed order of syntax elements in VUI
Related to R0090
---
source/Lib/DecoderLib/VLCReader.cpp | 8 ++++----
source/Lib/EncoderLib/VLCWriter.cpp | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 0b90a6aa9..6194bf223 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -1120,6 +1120,10 @@ void HLSyntaxReader::parseVUI(VUI* pcVUI, SPS *pcSPS)
uint32_t symbol;
+#if JVET_R0090_VUI
+ READ_FLAG(symbol, "vui_general_progressive_source_flag" ); pcVUI->setProgressiveSourceFlag(symbol ? true : false);
+ READ_FLAG(symbol, "vui_general_interlaced_source_flag" ); pcVUI->setInterlacedSourceFlag(symbol ? true : false);
+#endif
READ_FLAG( symbol, "vui_aspect_ratio_info_present_flag"); pcVUI->setAspectRatioInfoPresentFlag(symbol);
if (pcVUI->getAspectRatioInfoPresentFlag())
{
@@ -1147,10 +1151,6 @@ void HLSyntaxReader::parseVUI(VUI* pcVUI, SPS *pcSPS)
READ_FLAG( symbol, "vui_video_full_range_flag"); pcVUI->setVideoFullRangeFlag(symbol);
}
-#if JVET_R0090_VUI
- READ_FLAG(symbol, "general_progressive_source_flag" ); pcVUI->setProgressiveSourceFlag(symbol ? true : false);
- READ_FLAG(symbol, "general_interlaced_source_flag" ); pcVUI->setInterlacedSourceFlag(symbol ? true : false);
-#endif
READ_FLAG( symbol, "vui_chroma_loc_info_present_flag"); pcVUI->setChromaLocInfoPresentFlag(symbol);
if (pcVUI->getChromaLocInfoPresentFlag())
{
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 57da1acfe..57ed7ba98 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -684,6 +684,10 @@ void HLSWriter::codeVUI( const VUI *pcVUI, const SPS* pcSPS )
#endif
+#if JVET_R0090_VUI
+ WRITE_FLAG(pcVUI->getProgressiveSourceFlag(), "vui_general_progressive_source_flag" );
+ WRITE_FLAG(pcVUI->getInterlacedSourceFlag(), "vui_general_interlaced_source_flag" );
+#endif
WRITE_FLAG(pcVUI->getAspectRatioInfoPresentFlag(), "vui_aspect_ratio_info_present_flag");
if (pcVUI->getAspectRatioInfoPresentFlag())
{
@@ -708,10 +712,6 @@ void HLSWriter::codeVUI( const VUI *pcVUI, const SPS* pcSPS )
WRITE_CODE(pcVUI->getMatrixCoefficients(), 8, "vui_matrix_coeffs");
WRITE_FLAG(pcVUI->getVideoFullRangeFlag(), "vui_video_full_range_flag");
}
-#if JVET_R0090_VUI
- WRITE_FLAG(pcVUI->getProgressiveSourceFlag(), "general_progressive_source_flag" );
- WRITE_FLAG(pcVUI->getInterlacedSourceFlag(), "general_interlaced_source_flag" );
-#endif
WRITE_FLAG(pcVUI->getChromaLocInfoPresentFlag(), "vui_chroma_loc_info_present_flag");
if (pcVUI->getChromaLocInfoPresentFlag())
{
--
GitLab