Changeset 974 in 3DVCSoftware

Timestamp:

6 Jul 2014, 05:24:49 (10 years ago)

Author:

tech

Message:

Cleanup part 8.

Location:

branches/HTM-11.1-dev0/source/Lib

Files:

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

branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -850 +850 @@
   Void    setVPSId       (Int i)              { m_VPSId = i;             }
 
+#if H_MV
   Void    setVpsBaseLayerInternalFlag( Bool flag ) { m_vpsBaseLayerInternalFlag = flag; } 
   Bool    getVpsBaseLayerInternalFlag(  )          { return m_vpsBaseLayerInternalFlag; } 
+#endif
 
   UInt    getMaxTLayers  ()                   { return m_uiMaxTLayers;   }

branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1407 +1407 @@
     }
   }
-#endif
 
   READ_FLAG( uiCode, "max_one_active_ref_layer_flag" ); pcVPS->setMaxOneActiveRefLayerFlag ( uiCode == 1 ); 
@@ -1862 +1861 @@
 }
 #endif
-
+#endif
 #if H_MV
 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, Int targetOlsIdx)

branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -89 +89 @@
 #if H_MV
   Void  parseSliceHeader          ( TComSlice*& /*rpcSlice*/, ParameterSetManagerDecoder* /*parameterSetManager*/, Int targetOlsIdx ) {}
+#else
+  Void  parseSliceHeader          ( TComSlice*& /*rpcSlice*/, ParameterSetManagerDecoder* /*parameterSetManager*/ ) {}
 #endif
   Void  parseTerminatingBit       ( UInt& ruiBit );

branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -833 +833 @@
     WRITE_FLAG( pcSPS->getSpsMultilayerExtensionFlag( ) ? 1 : 0 , "sps_multilayer_extension_flag" );
 #if !H_3D
-    WRITE_CODE( pcSPS->getSpsExtension6bits( ), 6, "sps_extension_6bits" );
+    WRITE_CODE( pcSPS->getSpsExtension6bits( ), 6, "sps_extension_6bits" );  
 #else
     WRITE_FLAG( pcSPS->getSps3dExtensionFlag( ) ? 1 : 0 , "sps_3d_extension_flag" );
     WRITE_CODE( pcSPS->getSpsExtension5bits( ), 5, "sps_extension_5bits" );
- }
+#endif
+  }
 
   if ( pcSPS->getSpsRangeExtensionsFlag() )
@@ -857 +858 @@
 #endif
 #endif
-#endif
+
 }