From 9c7ddfa78f4a1b14b4fe3ac2fa0bf02c1bdb42f8 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Mon, 2 Mar 2020 20:44:48 +0100
Subject: [PATCH] fix trace strings for VPS/DCI
* align with spec
* align encoder/decoder
* fix header to trace DCI instead of DPS
---
source/Lib/CommonLib/Slice.cpp | 7 +++++++
source/Lib/CommonLib/Slice.h | 4 ++++
source/Lib/DecoderLib/VLCReader.cpp | 8 ++++----
source/Lib/EncoderLib/VLCWriter.cpp | 12 ++++++------
4 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 1fe39dfaa..b05b43669 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -3951,10 +3951,17 @@ void xTraceVPSHeader()
DTRACE( g_trace_ctx, D_HEADER, "=========== Video Parameter Set ===========\n" );
}
+#if !JVET_Q0117_PARAMETER_SETS_CLEANUP
void xTraceDPSHeader()
{
DTRACE( g_trace_ctx, D_HEADER, "=========== Decoding Parameter Set ===========\n" );
}
+#else
+void xTraceDCIHeader()
+{
+ DTRACE( g_trace_ctx, D_HEADER, "=========== Decoding Capability Information ===========\n" );
+}
+#endif
void xTraceSPSHeader()
{
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index c35b0c7bb..44d3d51c4 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -3342,7 +3342,11 @@ public:
#if ENABLE_TRACING
void xTraceVPSHeader();
+#if !JVET_Q0117_PARAMETER_SETS_CLEANUP
void xTraceDPSHeader();
+#else
+void xTraceDCIHeader();
+#endif
void xTraceSPSHeader();
void xTracePPSHeader();
void xTraceAPSHeader();
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 8e704662e..de1a0c943 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2267,7 +2267,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
void HLSyntaxReader::parseDCI(DCI* dci)
{
#if ENABLE_TRACING
- xTraceDPSHeader();
+ xTraceDCIHeader();
#endif
uint32_t symbol;
@@ -2406,7 +2406,7 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
{
if (pcVPS->getAllIndependentLayersFlag())
{
- READ_FLAG(uiCode, "vps_each_layer_is_an_ols_flag"); pcVPS->setEachLayerIsAnOlsFlag(uiCode);
+ READ_FLAG(uiCode, "each_layer_is_an_ols_flag"); pcVPS->setEachLayerIsAnOlsFlag(uiCode);
if (pcVPS->getEachLayerIsAnOlsFlag() == 0)
{
pcVPS->setOlsModeIdc(2);
@@ -2416,7 +2416,7 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
{
if (!pcVPS->getAllIndependentLayersFlag())
{
- READ_CODE(2, uiCode, "vps_ols_mode_idc"); pcVPS->setOlsModeIdc(uiCode); CHECK(uiCode > MAX_VPS_OLS_MODE_IDC, "Invalid code");
+ READ_CODE(2, uiCode, "ols_mode_idc"); pcVPS->setOlsModeIdc(uiCode); CHECK(uiCode > MAX_VPS_OLS_MODE_IDC, "Invalid code");
}
if (pcVPS->getOlsModeIdc() == 2)
{
@@ -2425,7 +2425,7 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
{
for (uint32_t j = 0; j < pcVPS->getMaxLayers(); j++)
{
- READ_FLAG(uiCode, "vps_ols_output_layer_flag"); pcVPS->setOlsOutputLayerFlag(i, j, uiCode);
+ READ_FLAG(uiCode, "ols_output_layer_flag"); pcVPS->setOlsOutputLayerFlag(i, j, uiCode);
}
}
}
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index 5a7c67b24..c4a8b2ed0 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1545,7 +1545,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
void HLSWriter::codeDCI(const DCI* dci)
{
#if ENABLE_TRACING
- xTraceDPSHeader();
+ xTraceDCIHeader();
#endif
WRITE_CODE(dci->getMaxSubLayersMinus1(), 3, "dci_max_sub_layers_minus1");
WRITE_CODE(0, 1, "dci_reserved_zero_bit");
@@ -1629,21 +1629,21 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
{
if (pcVPS->getAllIndependentLayersFlag())
{
- WRITE_FLAG(pcVPS->getEachLayerIsAnOlsFlag(), "vps_each_layer_is_an_ols_flag");
+ WRITE_FLAG(pcVPS->getEachLayerIsAnOlsFlag(), "each_layer_is_an_ols_flag");
}
if (!pcVPS->getEachLayerIsAnOlsFlag())
{
if (!pcVPS->getAllIndependentLayersFlag()) {
- WRITE_CODE(pcVPS->getOlsModeIdc(), 2, "vps_ols_mode_idc");
+ WRITE_CODE(pcVPS->getOlsModeIdc(), 2, "ols_mode_idc");
}
if (pcVPS->getOlsModeIdc() == 2)
{
- WRITE_CODE(pcVPS->getNumOutputLayerSets() - 1, 8, "vps_num_output_layer_sets_minus1");
+ WRITE_CODE(pcVPS->getNumOutputLayerSets() - 1, 8, "num_output_layer_sets_minus1");
for (uint32_t i = 1; i < pcVPS->getNumOutputLayerSets(); i++)
{
for (uint32_t j = 0; j < pcVPS->getMaxLayers(); j++)
{
- WRITE_FLAG(pcVPS->getOlsOutputLayerFlag(i, j), "vps_ols_output_layer_flag");
+ WRITE_FLAG(pcVPS->getOlsOutputLayerFlag(i, j), "ols_output_layer_flag");
}
}
}
@@ -1663,7 +1663,7 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
int cnt = 0;
while (m_pcBitIf->getNumBitsUntilByteAligned())
{
- WRITE_FLAG( 0, "rbsp_alignment_zero_bit");
+ WRITE_FLAG( 0, "vps_ptl_alignment_zero_bit");
cnt++;
}
CHECK(cnt>=8, "More than '8' alignment bytes written");
--
GitLab