diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp index c517bfcc4dfe904eee78d3e5aa01a8827ae0f585..692c5b166f563c8b831858ca9886c7c29f0a3059 100644 --- a/source/App/EncoderApp/EncApp.cpp +++ b/source/App/EncoderApp/EncApp.cpp @@ -522,9 +522,9 @@ void EncApp::xInitLibCfg() //====== Coding Structure ======== m_cEncLib.setIntraPeriod ( m_iIntraPeriod ); #if GDR_ENABLED - m_cEncLib.setGdrPeriod ( m_iGdrPeriod ); + m_cEncLib.setGdrPeriod ( m_gdrPeriod ); m_cEncLib.setGdrPocStart ( m_gdrPocStart ); - m_cEncLib.setGdrFrequency ( m_iGdrFrequency); + m_cEncLib.setGdrFrequency ( m_gdrFrequency); m_cEncLib.setStartWithGdr ( m_bStartWithGdr ); m_cEncLib.setNoHashForGdr ( m_bNoHashForGdr ); m_cEncLib.setGdrPicOutput ( m_bGdrPicOutput ); diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 4b59e17dbf2058581cd6d69d672a4f4b9e04bc5d..85b246d02f1ae11bc19a009943244e61c5bbd0fd 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -1008,8 +1008,8 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) ("IntraPeriod,-ip", m_iIntraPeriod, -1, "Intra period in frames, (-1: only first frame)") #if GDR_ENABLED ("GdrPocStart", m_gdrPocStart, -1, "GDR poc start") - ("GdrPeriod", m_iGdrPeriod, -1, "GDR period") - ("GdrFrequency", m_iGdrFrequency, -1, "GDR freqency") + ("GdrPeriod", m_gdrPeriod, -1, "GDR period") + ("GdrFrequency", m_gdrFrequency, -1, "GDR freqency") ("StartWithGDR", m_bStartWithGdr, false, "Start bitstream with GDR") ("NoHashforGDR", m_bNoHashForGdr, true, "No Hash for GDR") ("GdrPicOutput", m_bGdrPicOutput, false, "Picture Output for GDR") @@ -1546,20 +1546,20 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) m_SMVD = false; - if (m_iGdrFrequency < 0) - m_iGdrFrequency = 2; + if (m_gdrFrequency < 0) + m_gdrFrequency = 2; if (m_gdrPocStart < 0) { if (m_iIntraPeriod > 0) m_gdrPocStart = m_iIntraPeriod; else - m_gdrPocStart = m_iFrameRate * m_iGdrFrequency; + m_gdrPocStart = m_iFrameRate * m_gdrFrequency; } - if (m_iGdrPeriod < 0) + if (m_gdrPeriod < 0) { - m_iGdrPeriod = m_iFrameRate; + m_gdrPeriod = m_iFrameRate; } if (m_iIntraPeriod == -1) @@ -1568,7 +1568,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] ) if (m_gdrPocStart % m_iFrameRate != 0) m_iIntraPeriod = -1; else - m_iIntraPeriod = m_iFrameRate * m_iGdrFrequency; + m_iIntraPeriod = m_iFrameRate * m_gdrFrequency; } } #endif diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h index b199d69e3371c47d0106d3c9edc3e2e9a2e8ca28..827cc344123c9a978af9f2a48ca9d78f1c43dee8 100644 --- a/source/App/EncoderApp/EncAppCfg.h +++ b/source/App/EncoderApp/EncAppCfg.h @@ -220,8 +220,8 @@ protected: int m_iIntraPeriod; ///< period of I-slice (random access period) #if GDR_ENABLED int m_gdrPocStart; - int m_iGdrPeriod; - int m_iGdrFrequency; + int m_gdrPeriod; + int m_gdrFrequency; bool m_bStartWithGdr; bool m_bNoHashForGdr; bool m_bGdrPicOutput;