Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.cpp


Ignore:
Timestamp:
11 Sep 2013, 14:40:25 (11 years ago)
Author:
tech
Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComRom.cpp

    r608 r622  
    347347{ //2x2   4x4   8x8 16x16 32x32 64x64
    348348     0,    7,   10,   11,   11,   13 };
    349 #if LGE_PKU_DMM3_OVERLAP_E0159
     349#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    350350const UChar g_dmm3IntraTabIdxBits[6] =
    351351{ //2x2   4x4   8x8 16x16 32x32 64x64
     
    380380Bool g_traceTU = true;
    381381Bool g_disableHLSTrace = false;
    382 UInt64 g_stopAtCounter   = 10803;
     382UInt64 g_stopAtCounter       = 48;
     383Bool g_traceCopyBack         = false;
     384Bool g_decTraceDispDer       = false;
     385Bool g_decTraceMvFromMerge   = false;
    383386#endif
    384387#endif
     
    611614std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
    612615
     616#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
     617Void initWedgeLists( Bool initNodeList )
     618#else
    613619Void initWedgeLists( Bool initRefinements )
     620#endif
    614621{
    615622  if( !g_dmmWedgeLists.empty() ) return;
     
    624631    g_dmmWedgeRefLists.push_back( acWedgeRefList );
    625632
     633#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
     634    if( initNodeList )
     635    {
     636#endif
    626637    // create WedgeNodeList
    627638    std::vector<TComWedgeNode> acWedgeNodeList;
     
    633644        cWedgeNode.setPatternIdx( uiPos );
    634645
     646#if !LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    635647        if( initRefinements )
    636648        {
     649#endif
    637650          UInt uiRefPos = 0;
    638651          for( Int iOffS = -1; iOffS <= 1; iOffS++ )
     
    681694            }
    682695          }
     696#if !LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
    683697        }
     698#endif
    684699        acWedgeNodeList.push_back( cWedgeNode );
    685700      }
    686701    }
    687702    g_dmmWedgeNodeLists.push_back( acWedgeNodeList );
     703#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
     704  }
     705#endif
    688706  }
    689707  return;
Note: See TracChangeset for help on using the changeset viewer.