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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_VIEW_ID_LEN, VIEW_ID_RELATED_SIGNALING

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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++)