Changeset 5 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

12 Dec 2011, 18:35:44 (13 years ago)

Author:

hhi

Message:

Clean version with cfg-files

File:

• trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (13 diffs)

trunk/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ +1 @@
+/* The copyright in this software is being made available under the BSD
+ * License, included below. This software may be subject to other third party
+ * and contributor rights, including patent rights, and no such rights are
+ * granted under this license.
+ *
+ * Copyright (c) 2010-2011, ISO/IEC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *  * Neither the name of the ISO/IEC nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 
 
@@ -145 +178 @@
   xReadFlag( uiCode ); pcSPS->setUseALF ( uiCode ? true : false );
   xReadFlag( uiCode ); pcSPS->setUseDQP ( uiCode ? true : false );
-#if !SB_NO_LowDelayCoding
+#if !HHI_NO_LowDelayCoding
   xReadFlag( uiCode ); pcSPS->setUseLDC ( uiCode ? true : false );
 #endif
@@ -193 +226 @@
 #endif
 
-#if HHI_DMM_INTRA
+#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   g_dDeltaDCsQuantOffset = Double(g_uiBitIncrement) -  2.0;
 #endif
@@ -209 +242 @@
   { // baseview SPS -> set standard values
     pcSPS->initMultiviewSPS         ( 0 );
+#if DEPTH_MAP_GENERATION
     pcSPS->setPredDepthMapGeneration( 0, false );
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
     pcSPS->setMultiviewResPredMode  ( 0 );
+#endif
   }
   else
@@ -220 +257 @@
       xReadSvlc(  iCode ); // view order index
       pcSPS->initMultiviewSPSDepth    ( uiCode, iCode );
+#if DEPTH_MAP_GENERATION
       pcSPS->setPredDepthMapGeneration( uiCode, true );
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
       pcSPS->setMultiviewResPredMode  ( 0 );
-#if HHI_DMM_INTRA
+#endif
+#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
       xReadFlag( uiCode );
-      pcSPS->setUseDepthModelModes( uiCode ? true : false );
-#endif
+      pcSPS->setUseDMM( uiCode ? true : false );
+#endif
+#if HHI_MPI
       xReadFlag( uiCode );
       pcSPS->setUseMVI( uiCode ? true : false );
+#endif
     }
     else
@@ -250 +293 @@
       pcSPS->initMultiviewSPS( uiViewId, iVOI, uiCamParPrecision, bCamParSlice, m_aaiTempScale, m_aaiTempOffset );
       
-      UInt uiPredDepthMapGeneration = 0, uiMultiviewMvPredMode = 0, uiPdmPrecision = 0, uiMultiviewResPredMode = 0;
+#if DEPTH_MAP_GENERATION
+      UInt uiPredDepthMapGeneration = 0, uiPdmPrecision = 0;
+#if HHI_INTER_VIEW_MOTION_PRED
+      UInt uiMultiviewMvPredMode = 0;
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
+      UInt uiMultiviewResPredMode = 0;
+#endif
       xReadUvlc( uiPredDepthMapGeneration );
       if( uiPredDepthMapGeneration )
@@ -260 +310 @@
           xReadSvlc( iCode );   m_aaiTempPdmOffset       [ uiViewId ][ uiBaseId ] = iCode;
         }
+#if HHI_INTER_VIEW_MOTION_PRED
         xReadUvlc  ( uiMultiviewMvPredMode );
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
         xReadFlag  ( uiMultiviewResPredMode );
-      }
+#endif
+      }
+#if HHI_INTER_VIEW_MOTION_PRED
       pcSPS->setPredDepthMapGeneration( uiViewId, false, uiPredDepthMapGeneration, uiMultiviewMvPredMode, uiPdmPrecision, m_aaiTempPdmScaleNomDelta, m_aaiTempPdmOffset );
+#else
+      pcSPS->setPredDepthMapGeneration( uiViewId, false, uiPredDepthMapGeneration, 0, uiPdmPrecision, m_aaiTempPdmScaleNomDelta, m_aaiTempPdmOffset );
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
       pcSPS->setMultiviewResPredMode  ( uiMultiviewResPredMode );
+#endif
+#endif
+#if HHI_MPI
       pcSPS->setUseMVI( false );
+#endif
     }
   }
@@ -844 +907 @@
 
   return ;
-}
-#endif
-
-#if MW_MVI_SIGNALLING_MODE == 0
-Void TDecCavlc::parseMvInheritanceFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  const Int iTextureModeDepth = pcCU->getTextureModeDepth( uiAbsPartIdx );
-  if( iTextureModeDepth != -1 && uiDepth > iTextureModeDepth )
-    return;
-
-  UInt uiSymbol;
-  xReadFlag( uiSymbol );
-  if( uiSymbol == 1 )
-  {
-    pcCU->setTextureModeDepthSubParts( uiDepth, uiAbsPartIdx, uiDepth );
-  }
 }
 #endif
@@ -2574 +2621 @@
 
 
+#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
 Void 
 TDecCavlc::parseMergeIndexMV( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth )
 {
   UInt  uiNumCand = 0;
-#if MW_MVI_SIGNALLING_MODE == 1
+#if HHI_MPI
   const Bool bMVIAvailable = pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE;
-  const UInt uiMviMergePos = bMVIAvailable ? MVI_MERGE_POS : MRG_MAX_NUM_CANDS;
+  const UInt uiMviMergePos = bMVIAvailable ? HHI_MPI_MERGE_POS : MRG_MAX_NUM_CANDS;
   if( bMVIAvailable )
     uiNumCand++;
@@ -2605 +2653 @@
   for( UInt uiIdx = 0; uiIdx <= ruiMergeIndex; uiIdx++ )
   {
-#if MW_MVI_SIGNALLING_MODE == 1
+#if HHI_MPI
     if( uiIdx > uiMviMergePos )
     {
@@ -2620 +2668 @@
     }
   }
-#if MW_MVI_SIGNALLING_MODE == 1
+#if HHI_MPI
   if( ruiMergeIndex > uiMviMergePos )
   {
@@ -2631 +2679 @@
 #endif
 }
+#endif
 
 
@@ -2642 +2691 @@
 Void TDecCavlc::parseMergeIndex ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth )
 {
-#if MW_MVI_SIGNALLING_MODE == 1
-  if( ( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE ) ||
-      ( pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) )
-#else
-  if( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE )
-#endif
+#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
+  if(
+#if HHI_INTER_VIEW_MOTION_PRED
+      ( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE ) ||
+#endif
+#if HHI_MPI
+      ( pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) ||
+#endif
+      0
+    )
   {
     parseMergeIndexMV( pcCU, ruiMergeIndex, uiAbsPartIdx, uiDepth );
     return;
   }
+#endif
 
   Bool bLeftInvolved = false;