Changeset 1167 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:14:31 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_VIDEO_SIGNAL_MOVE, VPS_VUI_VIDEO_SIGNAL

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.h (modified) (4 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2045 +2045 @@
   ::memset(m_minHorizontalCtuOffsetPlus1,   0, sizeof(m_minHorizontalCtuOffsetPlus1));
 #endif
-#if VPS_VUI_VIDEO_SIGNAL
+
   m_vidSigPresentVpsFlag=true;
   m_vpsVidSigInfo=1;
@@ -2058 +2058 @@
     m_vpsMatCoeff[i] = 2;
   }
-#endif
+
   ::memset(m_bitRatePresentFlag, 0, sizeof(m_bitRatePresentFlag));
   ::memset(m_picRatePresentFlag, 0, sizeof(m_picRatePresentFlag));

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -693 +693 @@
   Bool       m_ctuBasedOffsetEnabledFlag   [MAX_VPS_LAYER_IDX_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
   Int        m_minHorizontalCtuOffsetPlus1 [MAX_VPS_LAYER_IDX_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
-#endif 
-#if VPS_VUI_VIDEO_SIGNAL
+#endif
+
   Bool       m_vidSigPresentVpsFlag;
   Int        m_vpsVidSigInfo;
@@ -703 +703 @@
   Int        m_vpsTransChar[16];
   Int        m_vpsMatCoeff[16];
-#endif
 
   Bool       m_bitRatePresentVpsFlag;
@@ -1084 +1083 @@
   Void   setMinHorizontalCtuOffsetPlus1 ( Int currLayerId, Int refLayerId, Int val )   { m_minHorizontalCtuOffsetPlus1[currLayerId][refLayerId] = val;}  
 #endif
-#if VPS_VUI_VIDEO_SIGNAL
+
   Bool   getVideoSigPresentVpsFlag()           { return m_vidSigPresentVpsFlag; }
   Void   setVideoSigPresentVpsFlag(Bool x)     { m_vidSigPresentVpsFlag = x;    }
@@ -1101 +1100 @@
   Int    getMaxtrixCoeff(Int idx)              { return m_vpsMatCoeff[idx];     }
   Void   setMaxtrixCoeff(Int idx, Int x)       { m_vpsMatCoeff[idx] = x;        }
-#endif
+
   Bool   getBitRatePresentVpsFlag()       { return m_bitRatePresentVpsFlag; }
   Void   setBitRatePresentVpsFlag(Bool x) { m_bitRatePresentVpsFlag = x;    }

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -119 +119 @@
 #define N0160_VUI_EXT_ILP_REF            1      ///< VUI extension inter-layer dependency offset signalling
 
-#define VPS_VUI_VIDEO_SIGNAL             1      ///< JCTVC-O0118 video signal information
-#if VPS_VUI_VIDEO_SIGNAL
-#define VPS_VUI_VIDEO_SIGNAL_MOVE        1      ///< JCTVC-P0076 Move video signal information syntax structure earlier in the VPS VUI
-#endif 
-
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
 

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

@@ -3467 +3467 @@
   }
 
-#if VPS_VUI_VIDEO_SIGNAL_MOVE
   READ_FLAG( uiCode, "video_signal_info_idx_present_flag" ); vps->setVideoSigPresentVpsFlag( uiCode == 1 );
   if (vps->getVideoSigPresentVpsFlag())
@@ -3509 +3508 @@
   }
 
-#endif 
 #if VPS_VUI_TILES_NOT_IN_USE__FLAG
   UInt layerIdx;
@@ -3589 +3587 @@
     }
   }
-#endif
-#if VPS_VUI_VIDEO_SIGNAL
-#if VPS_VUI_VIDEO_SIGNAL_MOVE
-#else
-  READ_FLAG( uiCode, "video_signal_info_idx_present_flag" ); vps->setVideoSigPresentVpsFlag( uiCode == 1 );
-  if (vps->getVideoSigPresentVpsFlag())
-  {
-    READ_CODE(4, uiCode, "vps_num_video_signal_info_minus1" ); vps->setNumVideoSignalInfo(uiCode + 1);
-  }
-  else
-  {
-    vps->setNumVideoSignalInfo(vps->getMaxLayers());
-  }
-
-
-  for(i = 0; i < vps->getNumVideoSignalInfo(); i++)
-  {
-    READ_CODE(3, uiCode, "video_vps_format" ); vps->setVideoVPSFormat(i,uiCode);
-    READ_FLAG(uiCode, "video_full_range_vps_flag" ); vps->setVideoFullRangeVpsFlag(i,uiCode);
-    READ_CODE(8, uiCode, "color_primaries_vps" ); vps->setColorPrimaries(i,uiCode);
-    READ_CODE(8, uiCode, "transfer_characteristics_vps" ); vps->setTransCharacter(i,uiCode);
-    READ_CODE(8, uiCode, "matrix_coeffs_vps" );vps->setMaxtrixCoeff(i,uiCode);
-  }
-  if(!vps->getVideoSigPresentVpsFlag())
-  {
-    for (i=0; i < vps->getMaxLayers(); i++)
-    {
-      vps->setVideoSignalInfoIdx(i,i);
-    }
-  }
-  else {
-    vps->setVideoSignalInfoIdx(0,0);
-    if (vps->getNumVideoSignalInfo() > 1 )
-    {
-      for (i=1; i < vps->getMaxLayers(); i++)
-        READ_CODE(4, uiCode, "vps_video_signal_info_idx" ); vps->setVideoSignalInfoIdx(i, uiCode);
-    }
-    else {
-      for (i=1; i < vps->getMaxLayers(); i++)
-      {
-        vps->setVideoSignalInfoIdx(i,0);
-      }
-    }
-  }
-#endif 
 #endif
 

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

@@ -2430 +2430 @@
     }
   }
-#if VPS_VUI_VIDEO_SIGNAL_MOVE
+
   WRITE_FLAG( vps->getVideoSigPresentVpsFlag(), "video_signal_info_idx_present_flag" );
   if (vps->getVideoSigPresentVpsFlag())
@@ -2453 +2453 @@
     }
   }
-#endif 
+
 #if VPS_VUI_TILES_NOT_IN_USE__FLAG
   UInt layerIdx;
@@ -2533 +2533 @@
   }
 #endif 
-#if VPS_VUI_VIDEO_SIGNAL
-#if VPS_VUI_VIDEO_SIGNAL_MOVE
-#else 
-    WRITE_FLAG( vps->getVideoSigPresentVpsFlag(), "video_signal_info_idx_present_flag" );
-    if (vps->getVideoSigPresentVpsFlag())
-    {
-        WRITE_CODE(vps->getNumVideoSignalInfo()-1, 4, "vps_num_video_signal_info_minus1" );
-    }
-    
-    for(i = 0; i < vps->getNumVideoSignalInfo(); i++)
-    {
-        WRITE_CODE(vps->getVideoVPSFormat(i), 3, "video_vps_format" );
-        WRITE_FLAG(vps->getVideoFullRangeVpsFlag(i), "video_full_range_vps_flag" );
-        WRITE_CODE(vps->getColorPrimaries(i), 8, "color_primaries_vps" );
-        WRITE_CODE(vps->getTransCharacter(i), 8, "transfer_characteristics_vps" );
-        WRITE_CODE(vps->getMaxtrixCoeff(i), 8, "matrix_coeffs_vps" );
-    }
-    
-    if (vps->getVideoSigPresentVpsFlag() && vps->getNumVideoSignalInfo() > 1 )
-    {
-        for (i=1; i < vps->getMaxLayers(); i++)
-            WRITE_CODE(vps->getVideoSignalInfoIdx(i), 4, "vps_video_signal_info_idx" );
-    }
-#endif 
-#endif
+
 #if O0164_MULTI_LAYER_HRD
     WRITE_FLAG(vps->getVpsVuiBspHrdPresentFlag(), "vps_vui_bsp_hrd_present_flag" );