Changeset 1305 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/App/TAppEncoder

Timestamp:

29 Jul 2015, 12:12:44 (9 years ago)

Author:

tech

Message:

Further fixes and alignments.

Location:

branches/HTM-14.1-update-dev1/source/App/TAppEncoder

Files:

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

branches/HTM-14.1-update-dev1/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1360 +1360 @@
   ("IlluCompEnable"        ,                          m_abUseIC                 , true                          , "Enable illumination compensation"          )
   ("IlluCompLowLatencyEnc" ,                          m_bUseLowLatencyICEnc     , false                         , "Enable low-latency illumination compensation encoding")
-#endif //H_3D
+#endif //NH_3D
     
   ;
@@ -3599 +3599 @@
   }
 #endif //HHI_VSO
-#endif //H_3D
+#endif //NH_3D
   printf("\n");
 #if NH_MV

branches/HTM-14.1-update-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -302 +302 @@
     m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL  : false );
     m_cTEncTop.setSps3dExtension               ( m_sps3dExtension );
-#endif // H_3D
+#endif // NH_3D
 
     m_cTEncTop.setIvPicLists                   ( &m_ivPicLists );