Merge branch 'compile2' into 'master'

Fix compiling when enabling HDR tools

See merge request jvet/VVCSoftware_VTM!2302

source/App/EncoderApp/EncApp.h

@@ -79,7 +79,7 @@ private:
   uint32_t          m_totalBytes;
   std::fstream     &m_bitstream;
 #if JVET_O0756_CALCULATE_HDRMETRICS
-  std::chrono::duration<long long, ratio<1, 1000000000>> m_metricTime;
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> m_metricTime;
 #endif
 
 private:
@@ -121,7 +121,7 @@ public:
   void  outputAU( const AccessUnit& au );
 
 #if JVET_O0756_CALCULATE_HDRMETRICS
-  std::chrono::duration<long long, ratio<1, 1000000000>> getMetricTime()    const { return m_metricTime; };
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> getMetricTime() const { return m_metricTime; };
 #endif
   VPS * getVPS() { return m_cEncLib.getVPS(); }
   int   getChromaFormatIDC() const { return m_cEncLib.getChromaFormatIdc(); }

source/Lib/EncoderLib/EncGOP.h

@@ -211,7 +211,7 @@ private:
   hdrtoolslib::ColorTransformParams   *m_pcColorTransformParams;
   hdrtoolslib::FrameFormat            *m_pcFrameFormat;
 
-  std::chrono::duration<long long, ratio<1, 1000000000>> m_metricTime;
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> m_metricTime;
 #endif
 
 public:
@@ -273,7 +273,7 @@ public:
   Analyze& getAnalyzeBData() { return m_gcAnalyzeB; }
 #endif
 #if JVET_O0756_CALCULATE_HDRMETRICS
-  std::chrono::duration<long long, ratio<1, 1000000000>> getMetricTime()    const { return m_metricTime; };
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> getMetricTime() const { return m_metricTime; };
 #endif
 
 protected:

source/Lib/EncoderLib/EncLib.h

@@ -121,7 +121,7 @@ private:
 
   bool                      m_doPlt;
 #if JVET_O0756_CALCULATE_HDRMETRICS
-  std::chrono::duration<long long, ratio<1, 1000000000>> m_metricTime;
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> m_metricTime;
 #endif
   int                       m_picIdInGOP;
 
@@ -201,7 +201,7 @@ public:
   bool                   getPltEnc()                      const { return   m_doPlt; }
   void                   checkPltStats( Picture* pic );
 #if JVET_O0756_CALCULATE_HDRMETRICS
-  std::chrono::duration<long long, ratio<1, 1000000000>> getMetricTime()    const { return m_metricTime; };
+  std::chrono::duration<long long, std::ratio<1, 1000000000>> getMetricTime() const { return m_metricTime; };
 #endif
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function