Changeset 1196 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncEntropy.h

Timestamp:

4 May 2015, 17:47:40 (9 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

File:

• trunk/source/Lib/TLibEncoder/TEncEntropy.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncEntropy.h

@@ -82 +82 @@
   virtual Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
   virtual Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   virtual Void codeDIS          ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#else
-#if H_3D_SINGLE_DEPTH
-  virtual Void codeSingleDepthMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#endif
 #endif
   virtual Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
@@ -179 +175 @@
   Void encodeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
   Void encodeSkipFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void encodeDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD=false );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void encodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD=false );
-#endif
 #endif
   Void encodePUWise       ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );