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


Ignore:
Timestamp:
12 Dec 2011, 18:35:44 (12 years ago)
Author:
hhi
Message:

Clean version with cfg-files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecSbac.cpp

    r2 r5  
     1/* The copyright in this software is being made available under the BSD
     2 * License, included below. This software may be subject to other third party
     3 * and contributor rights, including patent rights, and no such rights are
     4 * granted under this license.
     5 *
     6 * Copyright (c) 2010-2011, ISO/IEC
     7 * All rights reserved.
     8 *
     9 * Redistribution and use in source and binary forms, with or without
     10 * modification, are permitted provided that the following conditions are met:
     11 *
     12 *  * Redistributions of source code must retain the above copyright notice,
     13 *    this list of conditions and the following disclaimer.
     14 *  * Redistributions in binary form must reproduce the above copyright notice,
     15 *    this list of conditions and the following disclaimer in the documentation
     16 *    and/or other materials provided with the distribution.
     17 *  * Neither the name of the ISO/IEC nor the names of its contributors may
     18 *    be used to endorse or promote products derived from this software without
     19 *    specific prior written permission.
     20 *
     21 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     24 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
     25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     31 * THE POSSIBILITY OF SUCH DAMAGE.
     32 */
     33
    134
    235
     
    1952, m_cCUSkipFlagSCModel        ( 1,             1,               NUM_SKIP_FLAG_CTX             )
    2053, m_cCUSplitFlagSCModel       ( 1,             1,               NUM_SPLIT_FLAG_CTX            )
    21 #if MW_MVI_SIGNALLING_MODE == 0
    22 , m_cCUMvInheritanceFlagSCModel(1,             1,               NUM_MVI_FLAG_CTX              )
    23 #endif
    2454, m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        )
    2555, m_cCUMergeIdxExtSCModel     ( 1,             1,               NUM_MERGE_IDX_EXT_CTX         )
     
    6494#endif
    6595, m_cViewIdxSCModel           ( 1,             1,               NUM_VIEW_IDX_CTX              )
    66 #if HHI_DMM_INTRA
     96#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    6797, m_cIntraDMMSCModel          ( 1,             1,               NUM_DMM_CTX                   )
    6898, m_cIntraWedgeSCModel        ( 1,             1,               NUM_WEDGE_CTX                 )
     
    85115 
    86116  m_cCUSplitFlagSCModel.initBuffer       ( eSliceType, iQp, (Short*)INIT_SPLIT_FLAG );
    87 #if MW_MVI_SIGNALLING_MODE == 0
    88   m_cCUMvInheritanceFlagSCModel.initBuffer( eSliceType, iQp, (Short*)INIT_MVI_FLAG );
    89 #endif
    90117  m_cCUSkipFlagSCModel.initBuffer        ( eSliceType, iQp, (Short*)INIT_SKIP_FLAG );
    91118  m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (Short*)INIT_MERGE_FLAG_EXT );
     
    127154  m_cCUTransSubdivFlagSCModel.initBuffer ( eSliceType, iQp, (Short*)INIT_TRANS_SUBDIV_FLAG );
    128155  m_cViewIdxSCModel.initBuffer           ( eSliceType, iQp, (Short*)INIT_VIEW_IDX );
    129 #if HHI_DMM_INTRA
     156#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    130157  m_cIntraDMMSCModel.initBuffer          ( eSliceType, iQp, (Short*)INIT_INTRA_DMM );
    131158  m_cIntraWedgeSCModel.initBuffer        ( eSliceType, iQp, (Short*)INIT_INTRA_WEDGELET );
     
    361388  return;
    362389}
    363 #if HHI_DMM_INTRA
     390#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    364391Void TDecSbac::xReadExGolombLevel( UInt& ruiSymbol, ContextModel& rcSCModel  )
    365392{
     
    552579
    553580
     581#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
    554582Void TDecSbac::parseMergeIndexMV( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth )
    555583{
    556 #if MW_MVI_SIGNALLING_MODE == 1
     584#if HHI_MPI
    557585  const Bool bMVIAvailable = pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE;
    558   const UInt uiMviMergePos = bMVIAvailable ? MVI_MERGE_POS : MRG_MAX_NUM_CANDS;
     586  const UInt uiMviMergePos = bMVIAvailable ? HHI_MPI_MERGE_POS : MRG_MAX_NUM_CANDS;
    559587#endif
    560588  //--- set number of candidates and availability ---
     
    563591  for( UInt uiIdx = 0; uiIdx < MRG_MAX_NUM_CANDS; uiIdx++ )
    564592  {
    565 #if MW_MVI_SIGNALLING_MODE == 1
     593#if HHI_MPI
    566594    if( uiIdx == uiMviMergePos )
    567595    {
     
    629657  }
    630658
    631 #if MW_MVI_SIGNALLING_MODE == 1
     659#if HHI_MPI
    632660  if( ruiMergeIndex > uiMviMergePos )
    633661  {
     
    661689  DTRACE_CABAC_T( "\n" );
    662690}
     691#endif
    663692
    664693
    665694Void TDecSbac::parseMergeIndex ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth )
    666695{
    667 #if MW_MVI_SIGNALLING_MODE == 1
    668   if( ( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE ) ||
    669       ( pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) )
    670 #else
    671   if( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE )
    672 #endif
     696#if HHI_INTER_VIEW_MOTION_PRED || HHI_MPI
     697  if(
     698#if HHI_INTER_VIEW_MOTION_PRED
     699      ( pcCU->getSlice()->getSPS()->getViewId() > 0 && ( pcCU->getSlice()->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE ) == PDM_USE_FOR_MERGE ) ||
     700#endif
     701#if HHI_MPI
     702      ( pcCU->getSlice()->getSPS()->getUseMVI() && pcCU->getSlice()->getSliceType() != I_SLICE && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) ||
     703#endif
     704      0
     705    )
    673706  {
    674707    parseMergeIndexMV( pcCU, ruiMergeIndex, uiAbsPartIdx, uiDepth );
    675708    return;
    676709  }
     710#endif
    677711
    678712  Bool bLeftInvolved = false;
     
    827861}
    828862
    829 #if MW_MVI_SIGNALLING_MODE == 0
    830 Void TDecSbac::parseMvInheritanceFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    831 {
    832   const Int iTextureModeDepth = pcCU->getTextureModeDepth( uiAbsPartIdx );
    833   if( iTextureModeDepth != -1 && uiDepth > iTextureModeDepth )
    834     return;
    835 
    836   UInt uiSymbol;
    837   m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUMvInheritanceFlagSCModel.get( 0, 0, pcCU->getCtxMvInheritanceFlag( uiAbsPartIdx, uiDepth ) ) );
    838   if( uiSymbol == 1 )
    839   {
    840     pcCU->setTextureModeDepthSubParts( uiDepth, uiAbsPartIdx, uiDepth );
    841   }
    842 }
    843 #endif
    844 
    845863/** parse partition size
    846864 * \param pcCU
     
    965983}
    966984
    967 #if HHI_DMM_INTRA
     985#if HHI_DMM_WEDGE_INTRA
    968986Void TDecSbac::xParseWedgeFullInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    969987{
     
    11361154  pcCU->setWedgePredDirDeltaDC2SubParts( iDC2, uiAbsPartIdx, uiDepth );
    11371155}
    1138 
     1156#endif
     1157#if HHI_DMM_PRED_TEX
    11391158Void TDecSbac::xParseWedgePredTexDeltaInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    11401159{
     
    12041223  UInt uiSymbol;
    12051224 
    1206 #if HHI_DMM_INTRA
     1225#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    12071226  UInt uiFlag = 0;
    1208   if ( pcCU->getSlice()->getSPS()->isDepth() && pcCU->getSlice()->getSPS()->getUseDepthModelModes() && g_uiMaxCUWidth>>uiDepth < 64 )
     1227  if ( pcCU->getSlice()->getSPS()->isDepth() && pcCU->getSlice()->getSPS()->getUseDMM() && g_uiMaxCUWidth>>uiDepth < 64 )
    12091228  {
    12101229    m_pcTDecBinIf->decodeBin( uiFlag, m_cIntraDMMSCModel.get(0, 0, 0) );
     
    12141233    UInt uiDMMode;
    12151234
    1216 #if DMM_NO_TEXTURE_MODES
    1217     pcCU->setTextureModeAllowanceSubParts( false, uiAbsPartIdx, uiDepth );
    1218 
     1235#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     1236    m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
     1237    m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1;
    12191238    if ( pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_NxN && g_uiMaxCUWidth>>uiDepth > 4 )
    12201239    {
    1221       m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1222       if( DMM_INTRA_MODE_BITS > 1 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1; }
    1223 
    1224       if( uiDMMode > 1 )
    1225       {
    1226         uiDMMode += 4;
    1227       }
    1228     }
    1229     else
    1230     {
    1231       m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
     1240      m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 2;
    12321241    }
    12331242#else
    1234     TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getTexturePic()->getPicYuvRec();
    1235     Int     iRefStride = pcPicYuvRef->getStride();
    1236     Pel*    piRefY;
    1237 
    1238     TComYuv cTempYuv;
    1239     UInt uiTempStride = 0;
    1240     Pel* piTempY;
    1241 
    1242     UInt uiWidth = g_uiMaxCUWidth>>uiDepth;
    1243     UInt uiHeight = g_uiMaxCUHeight>>uiDepth;
    1244     piRefY = pcPicYuvRef->getLumaAddr( pcCU->getAddr(), uiAbsPartIdx );
    1245     cTempYuv.create( uiWidth, uiHeight ); cTempYuv.clear();
    1246     piTempY = cTempYuv.getLumaAddr( 0, uiWidth );
    1247     uiTempStride = cTempYuv.getStride();
    1248 
    1249     for ( Int y = 0; y < uiHeight; y++ )
    1250     {
    1251       ::memcpy(piTempY, piRefY, sizeof(Pel)*uiWidth);
    1252       piTempY += uiTempStride;
    1253       piRefY += iRefStride;
    1254     }
    1255 
    1256     UInt64 uiDCSAD = cTempYuv.getLumaDistDCSAD( uiWidth );
    1257 
    1258     cTempYuv.destroy();
    1259 
    1260     if( uiDCSAD < (UInt)(pcCU->getQP(0))/2 )
    1261     {
    1262       pcCU->setTextureModeAllowanceSubParts( false, uiAbsPartIdx, uiDepth );
    1263 
     1243        m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    12641244      if ( pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_NxN && g_uiMaxCUWidth>>uiDepth > 4 )
    12651245      {
    1266                                         m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1267         if( DMM_INTRA_MODE_BITS > 1 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1; }
    1268 
    1269         if( uiDMMode > 1 )
    1270         {
    1271           uiDMMode += 4;
    1272         }
    1273       }
    1274       else
    1275       {
    1276         pcCU->setTextureModeAllowanceSubParts( true, uiAbsPartIdx, uiDepth );
    1277 
    1278         m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1279       }
    1280     }
    1281     else
    1282     {
    1283                                       m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1284       if( DMM_INTRA_MODE_BITS > 1 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1; }
    1285       if ( pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_NxN && g_uiMaxCUWidth>>uiDepth > 4 )
    1286       {
    1287         if( DMM_INTRA_MODE_BITS > 2 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 2; }
    1288       }
    1289     }
    1290 #endif
    1291     uiIPredMode = g_aucAdditionalIntraModeList[uiDMMode];
    1292 
     1246      m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1;
     1247    }
     1248#endif
     1249    uiIPredMode = uiDMMode + MAX_MODE_ID_INTRA_DIR + 1;
     1250
     1251#if HHI_DMM_WEDGE_INTRA
    12931252    if( uiIPredMode == DMM_WEDGE_FULL_IDX )          { xParseWedgeFullInfo          ( pcCU, uiAbsPartIdx, uiDepth ); }
    12941253    if( uiIPredMode == DMM_WEDGE_FULL_D_IDX )        { xParseWedgeFullDeltaInfo     ( pcCU, uiAbsPartIdx, uiDepth ); }
    12951254    if( uiIPredMode == DMM_WEDGE_PREDDIR_IDX )       { xParseWedgePredDirInfo       ( pcCU, uiAbsPartIdx, uiDepth ); }
    12961255    if( uiIPredMode == DMM_WEDGE_PREDDIR_D_IDX )     { xParseWedgePredDirDeltaInfo  ( pcCU, uiAbsPartIdx, uiDepth ); }
     1256#endif
     1257#if HHI_DMM_PRED_TEX
    12971258    if( uiIPredMode == DMM_WEDGE_PREDTEX_D_IDX )     { xParseWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx, uiDepth ); }
    12981259    if( uiIPredMode == DMM_CONTOUR_PREDTEX_D_IDX )   { xParseContourPredTexDeltaInfo( pcCU, uiAbsPartIdx, uiDepth ); }
     1260#endif
    12991261  }
    13001262  else
     
    13701332  UInt uiSymbol;
    13711333
    1372 #if HHI_DMM_INTRA
     1334#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    13731335  UInt uiFlag = 0;
    1374   if ( pcCU->getSlice()->getSPS()->isDepth() && pcCU->getSlice()->getSPS()->getUseDepthModelModes() && g_uiMaxCUWidth>>uiDepth < 64 )
     1336  if ( pcCU->getSlice()->getSPS()->isDepth() && pcCU->getSlice()->getSPS()->getUseDMM() && g_uiMaxCUWidth>>uiDepth < 64 )
    13751337  {
    13761338    m_pcTDecBinIf->decodeBin( uiFlag, m_cIntraDMMSCModel.get(0, 0, 0) );
     
    13791341  {
    13801342    UInt uiDMMode;
    1381     TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getTexturePic()->getPicYuvRec();
    1382     Int     iRefStride = pcPicYuvRef->getStride();
    1383     Pel*    piRefY;
    1384 
    1385     TComYuv cTempYuv;
    1386     UInt uiTempStride = 0;
    1387     Pel* piTempY;
    1388 
    1389     UInt uiWidth = g_uiMaxCUWidth>>uiDepth;
    1390     UInt uiHeight = g_uiMaxCUHeight>>uiDepth;
    1391     piRefY = pcPicYuvRef->getLumaAddr( pcCU->getAddr(), uiAbsPartIdx );
    1392     cTempYuv.create( uiWidth, uiHeight ); cTempYuv.clear();
    1393     piTempY = cTempYuv.getLumaAddr( 0, uiWidth );
    1394     uiTempStride = cTempYuv.getStride();
    1395 
    1396     for ( Int y = 0; y < uiHeight; y++ )
    1397     {
    1398       ::memcpy(piTempY, piRefY, sizeof(Pel)*uiWidth);
    1399       piTempY += uiTempStride;
    1400       piRefY += iRefStride;
    1401     }
    1402 
    1403     UInt64 uiDCSAD = cTempYuv.getLumaDistDCSAD( uiWidth );
    1404 
    1405     if( uiDCSAD < 23 )
    1406     {
     1343
     1344#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     1345    m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
     1346    m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1;
    14071347      if ( pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_NxN && g_uiMaxCUWidth>>uiDepth > 4 )
    14081348      {
    1409         m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1410         if( DMM_INTRA_MODE_BITS > 1 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1; }
    1411 
    1412         if( uiDMMode > 1 )
    1413         {
    1414           uiDMMode += 4;
     1349      m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 2;
    14151350        }
    1416       }
    1417       else
    1418       {
    1419         m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1420       }
    1421     }
    1422     else
    1423     {
     1351#else
    14241352      m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode  = uiSymbol;
    1425       if( DMM_INTRA_MODE_BITS > 1 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1; }
    14261353      if ( pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_NxN && g_uiMaxCUWidth>>uiDepth > 4 )
    14271354      {
    1428         if( DMM_INTRA_MODE_BITS > 2 ) { m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 2; }
    1429       }
    1430     }
     1355      m_pcTDecBinIf->decodeBin( uiSymbol, m_cIntraDMMSCModel.get(0, 0, 1) ); uiDMMode |= uiSymbol << 1;
     1356    }
     1357#endif
    14311358    uiIPredMode = g_aucAdditionalIntraModeList[uiDMMode];
    14321359
     1360#if HHI_DMM_WEDGE_INTRA
    14331361    if( uiIPredMode == DMM_WEDGE_FULL_IDX )          { xParseWedgeFullInfo          ( pcCU, uiAbsPartIdx, uiDepth ); }
    14341362    if( uiIPredMode == DMM_WEDGE_FULL_D_IDX )        { xParseWedgeFullDeltaInfo     ( pcCU, uiAbsPartIdx, uiDepth ); }
    14351363    if( uiIPredMode == DMM_WEDGE_PREDDIR_IDX )       { xParseWedgePredDirInfo       ( pcCU, uiAbsPartIdx, uiDepth ); }
    14361364    if( uiIPredMode == DMM_WEDGE_PREDDIR_D_IDX )     { xParseWedgePredDirDeltaInfo  ( pcCU, uiAbsPartIdx, uiDepth ); }
     1365#endif
     1366#if HHI_DMM_PRED_TEX
    14371367    if( uiIPredMode == DMM_WEDGE_PREDTEX_D_IDX )     { xParseWedgePredTexDeltaInfo  ( pcCU, uiAbsPartIdx, uiDepth ); }
    14381368    if( uiIPredMode == DMM_CONTOUR_PREDTEX_D_IDX )   { xParseContourPredTexDeltaInfo( pcCU, uiAbsPartIdx, uiDepth ); }
     1369#endif
    14391370  }
    14401371  else
Note: See TracChangeset for help on using the changeset viewer.