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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: R0156_CONF_WINDOW_IN_REP_FORMAT

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3629 +3629 @@
 #endif 
 
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
   READ_FLAG( uiCode, "conformance_window_vps_flag" );
   if( uiCode != 0) 
@@ -3639 +3638 @@
     READ_UVLC( uiCode, "conf_win_vps_bottom_offset" );       conf.setWindowBottomOffset( uiCode );
   }
-#endif
-}
-#endif
+}
+#endif //REPN_FORMAT_IN_VPS
 #if VPS_DPB_SIZE_TABLE
 Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -240 +240 @@
 {
   Int  numReorderPics[MAX_TLAYER];
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
+#if SVC_EXTENSION
   Window &conformanceWindow = pcSlice->getConformanceWindow();
 #else
@@ -562 +562 @@
 
       Int  numReorderPics[MAX_TLAYER];
-#if !R0156_CONF_WINDOW_IN_REP_FORMAT
-      Window conformanceWindow;
-#endif
       Window defaultDisplayWindow;
 
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
 #if AUXILIARY_PICTURES
       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), repFormat->getConformanceWindowVps(), defaultDisplayWindow, numReorderPics, NULL, true);
 #else
       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), repFormat->getConformanceWindowVps(), defaultDisplayWindow, numReorderPics, NULL, true);
-#endif
-#else
-#if AUXILIARY_PICTURES
-      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
-#else
-      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
-#endif
 #endif
       // it is needed where the VPS is accessed through the slice
@@ -2489 +2478 @@
 
     Int  numReorderPics[MAX_TLAYER];
-#if R0156_CONF_WINDOW_IN_REP_FORMAT
     Window &conformanceWindow = slice->getConformanceWindow();
-#else
-    Window &conformanceWindow = pcSPS->getConformanceWindow();
-#endif
     Window defaultDisplayWindow = pcSPS->getVuiParametersPresentFlag() ? pcSPS->getVuiParameters()->getDefaultDisplayWindow() : Window();