Changeset 621 in 3DVCSoftware for branches/HTM-8.0-dev0/source


Ignore:
Timestamp:
10 Sep 2013, 14:59:07 (11 years ago)
Author:
tech
Message:

Fixed xRestrictBipredMergeCand call.
Other minor cleanups.

Location:
branches/HTM-8.0-dev0/source/Lib
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComRom.cpp

    r618 r621  
    372372const Bool g_bEncDecTraceEnable  = true;
    373373const Bool g_bEncDecTraceDisable = false;
    374 Bool   g_HLSTraceEnable = false;
     374Bool   g_HLSTraceEnable = true;
    375375Bool   g_bJustDoIt = false;
    376376UInt64 g_nSymbolCounter = 0;
  • branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComRom.h

    r618 r621  
    198198
    199199#ifndef ENC_DEC_TRACE
    200 # define ENC_DEC_TRACE 0
     200#define ENC_DEC_TRACE  0
    201201#endif
    202202
  • branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r618 r621  
    38263826}
    38273827#endif
    3828 #if SIGNAL_BITRATE_PICRATE_IN_VPS
    3829 TComBitRatePicRateInfo::TComBitRatePicRateInfo()
    3830 {
    3831   ::memset(m_bitRateInfoPresentFlag, 0, sizeof(m_bitRateInfoPresentFlag));
    3832   ::memset(m_picRateInfoPresentFlag, 0, sizeof(m_picRateInfoPresentFlag));
    3833   ::memset(m_avgBitRate,             0, sizeof(m_avgBitRate));
    3834   ::memset(m_maxBitRate,             0, sizeof(m_maxBitRate));
    3835   ::memset(m_constantPicRateIdc,     0, sizeof(m_constantPicRateIdc));
    3836   ::memset(m_avgPicRate,             0, sizeof(m_avgPicRate));
    3837 }
    3838 #endif
    38393828//! \}
    38403829
  • branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r618 r621  
    698698#endif
    699699#else
    700     READ_UVLC ( uiCode, "sps_max_latency_increase");
     700    READ_UVLC ( uiCode, "sps_max_latency_increase_plus1");
    701701#endif
    702702    pcSPS->setMaxLatencyIncrease( uiCode, i );
  • branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r615 r621  
    260260      else
    261261      {
    262         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx); // Redundant line
     262        uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    263263#if H_3D_VSP
    264264        Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
  • branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r615 r621  
    36423642#if H_3D_VSP
    36433643  xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours,vspFlag, numValidMergeCand );
    3644 #endif
     3644#else
     3645  xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     3646#endif
     3647
    36453648
    36463649  ruiCost = MAX_UINT;
  • branches/HTM-8.0-dev0/source/Lib/TLibEncoder/TEncTop.cpp

    r618 r621  
    515515  // mark it should be extended
    516516  rpcPic->getPicYuvRec()->setBorderExtension(false);
     517
     518#if H_MV
    517519  rpcPic->getPicYuvOrg()->setBorderExtension(false);
     520#endif
    518521}
    519522
     
    755758#endif
    756759  m_cPPS.setSignHideFlag(getSignHideFlag());
    757 #if L0386_DB_METRIC
    758   if ( getDeblockingFilterMetric() )
    759   {
    760     m_cPPS.setDeblockingFilterControlPresentFlag (true);
    761     m_cPPS.setDeblockingFilterOverrideEnabledFlag(true);
    762     m_cPPS.setPicDisableDeblockingFilterFlag(false);
    763     m_cPPS.setDeblockingFilterBetaOffsetDiv2(0);
    764     m_cPPS.setDeblockingFilterTcOffsetDiv2(0);
    765   }
    766   else
    767   {
    768760  m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
    769   }
    770 #else
    771   m_cPPS.setDeblockingFilterControlPresentFlag (m_DeblockingFilterControlPresent );
    772 #endif
    773761  m_cPPS.setLog2ParallelMergeLevelMinus2   (m_log2ParallelMergeLevelMinus2 );
    774762  m_cPPS.setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);
Note: See TracChangeset for help on using the changeset viewer.