Changeset 1117 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

7 Jul 2015, 01:35:39 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0156_CONF_WINDOW_IN_REP_FORMAT

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2488 +2488 @@
 #endif
 
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
   Window conf = repFormat->getConformanceWindowVps();
 
@@ -2499 +2498 @@
     WRITE_UVLC( conf.getWindowBottomOffset(), "conf_win_vps_bottom_offset" );
   }
-#endif
 }
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1530 +1530 @@
 
     Int  numReorderPics[MAX_TLAYER];
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
     Window &conformanceWindow = repFormat->getConformanceWindowVps();
-#else
-    Window &conformanceWindow = m_cSPS.getConformanceWindow();
-#endif
     Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window();