From 52d2acad45dc4c3fd26ea24164128a29b6840b75 Mon Sep 17 00:00:00 2001 From: Frank Bossen <fbossen@gmail.com> Date: Sun, 28 Aug 2022 23:04:41 -0400 Subject: [PATCH] Fix compiling when enabling HDR tools --- source/App/EncoderApp/EncApp.h | 4 ++-- source/Lib/EncoderLib/EncGOP.h | 4 ++-- source/Lib/EncoderLib/EncLib.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/App/EncoderApp/EncApp.h b/source/App/EncoderApp/EncApp.h index af18f8b7e..ac9ea909d 100644 --- a/source/App/EncoderApp/EncApp.h +++ b/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(); } diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h index c999c563e..6a1e07169 100644 --- a/source/Lib/EncoderLib/EncGOP.h +++ b/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: diff --git a/source/Lib/EncoderLib/EncLib.h b/source/Lib/EncoderLib/EncLib.h index 24938f87e..095b4dfef 100644 --- a/source/Lib/EncoderLib/EncLib.h +++ b/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 -- GitLab