Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/App

Timestamp:

13 Jan 2014, 08:05:57 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-9.2-dev0/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncTop.cpp (modified) (2 diffs)

branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1743 +1743 @@
    * This permits the ability to omit a GOP structure specification */
 #if H_MV
-  if (m_iIntraPeriod[layer] == 1 && m_GOPList[0].m_POC == -1)
-  {
+  if (m_iIntraPeriod[layer] == 1 && m_GOPList[0].m_POC == -1) {
 #else
   if (m_iIntraPeriod == 1 && m_GOPList[0].m_POC == -1) {
@@ -1773 +1772 @@
   Int numOK=0;
 #if H_MV
+  xConfirmPara( m_iIntraPeriod[layer] >=0&&(m_iIntraPeriod[layer]%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" ); 
+#else
 xConfirmPara( m_iIntraPeriod >=0&&(m_iIntraPeriod%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
-#else
-  xConfirmPara( m_iIntraPeriod[layer] >=0&&(m_iIntraPeriod[layer]%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" ); 
 #endif
 

branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -208 +208 @@
 
     m_cTEncTop.setIvPicLists                   ( &m_ivPicLists ); 
-  // H_MV
+#endif  // H_MV
   m_cTEncTop.setVPS(&vps);
 
@@ -1945 +1945 @@
 }
 #endif
-#endif
+
 //! \}