Changeset 42 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSbac.cpp

Timestamp:

26 Mar 2012, 18:05:40 (13 years ago)

Author:

tech

Message:

Nokia (Flexible Coding Order)
Ericsson ( High Level Syntax )
changes

File:

• trunk/source/Lib/TLibEncoder/TEncSbac.cpp (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -177 +177 @@
 }
 
+#if BITSTREAM_EXTRACTION
+Void TEncSbac::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, UInt uiLayerId )
+#else
 Void TEncSbac::codeNALUnitHeader( NalUnitType eNalUnitType, NalRefIdc eNalRefIdc, UInt TemporalId, Bool bOutputFlag )
+#endif
 {
   assert (0);
@@ -1126 +1130 @@
 #endif
 #if HHI_DMM_PRED_TEX
+#if FLEX_CODING_ORDER
+    if ( !pcCU->getSlice()->getSPS()->getUseDMM34() )
+    {
+      assert( uiDir != DMM_WEDGE_PREDTEX_D_IDX );
+      assert( uiDir != DMM_CONTOUR_PREDTEX_D_IDX );
+    }
+#endif
     if( uiDir == DMM_WEDGE_PREDTEX_D_IDX )     { xCodeWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx ); }
     if( uiDir == DMM_CONTOUR_PREDTEX_D_IDX )   { xCodeContourPredTexDeltaInfo( pcCU, uiAbsPartIdx ); }