Merge branch 'addlayeridtoopl' into 'master'

Add layer ID to output picture log file

See merge request jvet/VVCSoftware_VTM!1881

source/App/DecoderApp/DecApp.cpp

@@ -390,6 +390,9 @@ void DecApp::writeLineToOutputLog(Picture * pcPic)
     const int croppedWidth  = pcPic->Y().width - leftOffset - rightOffset;
     const int croppedHeight = pcPic->Y().height - topOffset - bottomOffset;
 
+#if OPL_ADD_LAYER_ID
+    m_oplFileStream << std::setw(3) << pcPic->layerId << ",";
+#endif
     m_oplFileStream << std::setw(8) << pcPic->getPOC() << "," << std::setw(5) << croppedWidth << "," << std::setw(5)
                     << croppedHeight << "," << hashToString(recon_digest, numChar) << "\n";
   }

source/Lib/CommonLib/TypeDef.h

@@ -72,6 +72,8 @@
 
 #define JVET_S_SUB_PROFILE                                1 // Move signalling of ptl_num_sub_profiles
 
+#define OPL_ADD_LAYER_ID                                  1 // Add layer ID to output picture log
+
 #define JVET_R0324_REORDER                                1 // Reordering of syntax elements JVET-R0324/JVET-R2001-v2
  
 #define JVET_S0097_VPS_default_values                     1 // JVET-S0097: infer values of variables in VPS when not present