Changeset 5 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

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

Author:

hhi

Message:

Clean version with cfg-files

File:

• trunk/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (14 diffs)

trunk/source/Lib/TLibEncoder/TEncCavlc.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.
+ */
+
 
 
@@ -258 +291 @@
   xWriteFlag  ( (pcSPS->getUseALF ()) ? 1 : 0 );
   xWriteFlag  ( (pcSPS->getUseDQP ()) ? 1 : 0 );
-#if !SB_NO_LowDelayCoding
+#if !HHI_NO_LowDelayCoding
   xWriteFlag  ( (pcSPS->getUseLDC ()) ? 1 : 0 );
 #endif
@@ -302 +335 @@
       xWriteUvlc( pcSPS->getViewId() );
       xWriteSvlc( pcSPS->getViewOrderIdx() );
-#if HHI_DMM_INTRA
-      xWriteFlag( pcSPS->getUseDepthModelModes() ? 1 : 0 );
-#endif
+#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
+      xWriteFlag( pcSPS->getUseDMM() ? 1 : 0 );
+#endif
+#if HHI_MPI
       xWriteFlag( pcSPS->getUseMVI() ? 1 : 0 );
+#endif
     }
     else
@@ -324 +359 @@
         }
       }
+#if DEPTH_MAP_GENERATION
       xWriteUvlc( pcSPS->getPredDepthMapGeneration() );
       if( pcSPS->getPredDepthMapGeneration() )
@@ -333 +369 @@
           xWriteSvlc( pcSPS->getPdmOffset       ()[ uiId ] );
         }
+#if HHI_INTER_VIEW_MOTION_PRED
         xWriteUvlc  ( pcSPS->getMultiviewMvPredMode() );
+#endif
+#if HHI_INTER_VIEW_RESIDUAL_PRED
         xWriteFlag  ( pcSPS->getMultiviewResPredMode() );
-      }
+#endif
+      }
+#endif
     }
   }
@@ -686 +727 @@
 
 
+#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
 Void 
 TEncCavlc::codeMergeIndexMV( TComDataCU* pcCU, UInt uiAbsPartIdx )
@@ -691 +733 @@
   UInt uiNumCand  = 0;
   UInt uiMergeIdx = pcCU->getMergeIndex( uiAbsPartIdx );
-#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 )
   {
@@ -699 +741 @@
     const Bool bUseMVI = pcCU->getTextureModeDepth( uiAbsPartIdx ) != -1;
     if( bUseMVI )
-      uiMergeIdx = MVI_MERGE_POS;
-    else if( uiMergeIdx >= MVI_MERGE_POS )
+      uiMergeIdx = HHI_MPI_MERGE_POS;
+    else if( uiMergeIdx >= HHI_MPI_MERGE_POS )
       uiMergeIdx++;
   }
@@ -754 +796 @@
   }
 }
-
+#endif
 
 
@@ -764 +806 @@
 Void TEncCavlc::codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
-#if MW_MVI_SIGNALLING_MODE == 1
+#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
+#if HHI_INTER_VIEW_MOTION_PRED && HHI_MPI
   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 ) )
+#elif HHI_MPI
+  if( 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 )
@@ -774 +819 @@
     return;
   }
+#endif
 
   Bool bLeftInvolved = false;
@@ -833 +879 @@
 
 
+#if HHI_INTER_VIEW_RESIDUAL_PRED
 Void 
 TEncCavlc::codeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
@@ -839 +886 @@
   xWriteFlag( uiSymbol );
 }
-
+#endif
 
 Void TEncCavlc::codeAlfCtrlFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
@@ -940 +987 @@
 #endif
 }
-
-#if MW_MVI_SIGNALLING_MODE == 0
-Void TEncCavlc::codeMvInheritanceFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  const Int iTextureModeDepth = pcCU->getTextureModeDepth( uiAbsPartIdx );
-  if( iTextureModeDepth != -1 && uiDepth > iTextureModeDepth )
-    return;
-  UInt uiSymbol = iTextureModeDepth == uiDepth ? 1 : 0;
-  xWriteFlag( uiSymbol );
-}
-#endif
 
 Void TEncCavlc::codeSplitFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )