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

Timestamp:

29 Mar 2014, 18:55:16 (10 years ago)

Author:

tech

Message:

Merged HTM-10.1-dev0@883. (MV-HEVC 7 HLS)

File:

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

trunk/source/Lib/TLibEncoder/TEncEntropy.h

@@ -95 +95 @@
 #endif
 #if H_3D_INTER_SDC
-#if QC_SDC_UNIFY_G0130
   virtual Void codeDeltaDC       ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
   virtual Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#else
-  virtual Void codeInterSDCFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-  virtual Void codeInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiSegment ) = 0;
-#endif
 #endif
 #if H_3D_DBBP
@@ -190 +185 @@
 #endif
 #if H_3D_INTER_SDC
-#if QC_SDC_UNIFY_G0130
   Void encodeDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx );
   Void encodeSDCFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
-#else
-  Void encodeInterSDCFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
-  Void encodeInterSDCResidualData( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD );
-#endif
 #endif
 #if H_3D_DBBP