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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_VIEW_ID_LEN, VIEW_ID_RELATED_SIGNALING

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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