Changeset 1190 in SHVCSoftware

Timestamp:

8 Jul 2015, 03:47:31 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0109_VIEW_ID_LEN, VIEW_ID_RELATED_SIGNALING

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -1964 +1964 @@
 , m_vpsNumRepFormats          (1)
 #endif
-#if VIEW_ID_RELATED_SIGNALING 
-#if O0109_VIEW_ID_LEN
 , m_viewIdLen                (0)
-#else
-, m_viewIdLenMinus1           (0)
-#endif
-#endif
 , m_vpsNonVuiExtLength (0)
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
@@ -2056 +2050 @@
   ::memset( m_vpsRepFormatIdx, 0, sizeof(m_vpsRepFormatIdx) );
 #endif
-#if VIEW_ID_RELATED_SIGNALING 
   ::memset(m_viewIdVal, 0, sizeof(m_viewIdVal));
-#endif
 
   for( Int i = 0; i < MAX_NUM_LAYER_IDS; i++ )
@@ -3278 +3270 @@
 }
 
-#if VIEW_ID_RELATED_SIGNALING 
 Int TComVPS::getNumViews()
 {
@@ -3293 +3284 @@
   return numViews;
 }
+
 Int TComVPS::getScalabilityId( Int layerIdInVps, ScalabilityType scalType )
 {
   return getScalabilityMask( scalType ) ? getDimensionId( layerIdInVps, scalTypeToScalIdx( scalType ) ) : 0;
-}  
+}
+
 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType )
 {
@@ -3310 +3303 @@
   return scalIdx; 
 }
-#endif
+
 #if VPS_DPB_SIZE_TABLE
 Int TComVPS::getLayerIdcForOls( Int olsIdx, Int layerId )

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

@@ -690 +690 @@
   Int        m_vpsRepFormatIdx[16];
 #endif
-#if VIEW_ID_RELATED_SIGNALING 
-#if O0109_VIEW_ID_LEN
   Int        m_viewIdLen;
-#else
-  Int        m_viewIdLenMinus1;
-#endif
   Int        m_viewIdVal                [MAX_LAYERS];
-#endif
 
   Int        m_numberRefLayers[MAX_NUM_LAYER_IDS];  // number of direct and indirect reference layers of a coding layer
@@ -1082 +1076 @@
   Void   setVpsRepFormatIdx(Int idx, Int x) { m_vpsRepFormatIdx[idx] = x;       }         
 #endif
-#if VIEW_ID_RELATED_SIGNALING
-#if O0109_VIEW_ID_LEN
+
   Void   setViewIdLen( Int  val )                                   { m_viewIdLen = val;  } 
   Int    getViewIdLen(  )                                           { return m_viewIdLen; } 
-#else
-  Void   setViewIdLenMinus1( Int  val )                             { m_viewIdLenMinus1 = val;  } 
-  Int    getViewIdLenMinus1(  )                                     { return m_viewIdLenMinus1; } 
-#endif
 
   Void   setViewIdVal( Int viewOrderIndex, Int  val )               { m_viewIdVal[viewOrderIndex] = val;  } 
@@ -1099 +1088 @@
   Int    getNumViews();
   Int    scalTypeToScalIdx( ScalabilityType scalType );
-#endif
+
 #if VPS_DPB_SIZE_TABLE
   Bool   getSubLayerFlagInfoPresentFlag(Int olsIdx)         { return m_subLayerFlagInfoPresentFlag[olsIdx]; }

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

@@ -63 +63 @@
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
 #define FIX_ALIGN_BUMPING                1
-#define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews
 
 #define O0164_MULTI_LAYER_HRD            1      ///< JCTVC-O0164: Multi-layer HRD operation
@@ -106 +105 @@
 #define MOTION_RESAMPLING_CONSTRAINT     1      ///< JCTVC-N0108: Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction.
 
-#define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
 #define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures

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

@@ -2725 +2725 @@
   }
 
-#if VIEW_ID_RELATED_SIGNALING
-#if O0109_VIEW_ID_LEN
   READ_CODE( 4, uiCode, "view_id_len" ); vps->setViewIdLen( uiCode );
-#else
-  READ_CODE( 4, uiCode, "view_id_len_minus1" ); vps->setViewIdLenMinus1( uiCode );
-#endif
-
-#if O0109_VIEW_ID_LEN
+
   if ( vps->getViewIdLen() > 0 )
   {
-    for(  i = 0; i < vps->getNumViews(); i++ )
+    for( i = 0; i < vps->getNumViews(); i++ )
     {
       READ_CODE( vps->getViewIdLen( ), uiCode, "view_id_val[i]" ); vps->setViewIdVal( i, uiCode );
     }
   }
-#else
-  for(  i = 0; i < vps->getNumViews(); i++ )
-  {
-    READ_CODE( vps->getViewIdLenMinus1( ) + 1, uiCode, "view_id_val[i]" ); vps->setViewIdVal( i, uiCode );
-  }
-#endif
-#endif // view id related signaling
 
   // For layer 0

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

@@ -2023 +2023 @@
   }
 
-#if VIEW_ID_RELATED_SIGNALING
-  // if ( pcVPS->getNumViews() > 1 )  
-  //   However, this is a bug in the text since, view_id_len_minus1 is needed to parse view_id_val. 
-  {
-#if O0109_VIEW_ID_LEN
-    WRITE_CODE( vps->getViewIdLen( ), 4, "view_id_len" );
-    assert ( vps->getNumViews() >= (1<<vps->getViewIdLen()) );
-#else
-    WRITE_CODE( vps->getViewIdLenMinus1( ), 4, "view_id_len_minus1" );
-#endif
-  }
-
-#if O0109_VIEW_ID_LEN
+  WRITE_CODE( vps->getViewIdLen( ), 4, "view_id_len" );
+  assert ( vps->getNumViews() >= (1<<vps->getViewIdLen()) );
+
   if ( vps->getViewIdLen() > 0 )
   {
-#endif
-  for(  i = 0; i < vps->getNumViews(); i++ )
-  {
-#if O0109_VIEW_ID_LEN
-    WRITE_CODE( vps->getViewIdVal( i ), vps->getViewIdLen( ), "view_id_val[i]" );
-#else
-    WRITE_CODE( vps->getViewIdVal( i ), vps->getViewIdLenMinus1( ) + 1, "view_id_val[i]" );
-#endif
-  }
-#if O0109_VIEW_ID_LEN
-  }
-#endif
-#endif // VIEW_ID_RELATED_SIGNALING
+    for( i = 0; i < vps->getNumViews(); i++ )
+    {
+      WRITE_CODE( vps->getViewIdVal( i ), vps->getViewIdLen( ), "view_id_val[i]" );
+    }
+  }
 
   for( Int layerCtr = 1; layerCtr < vps->getMaxLayers(); layerCtr++)