Changeset 541 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2


Ignore:
Timestamp:
23 Jul 2013, 14:37:07 (11 years ago)
Author:
tech
Message:
  • Changed HM Version number
  • Minor cleanups
Location:
branches/HTM-DEV-0.3-dev2/source/Lib
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

    r537 r541  
    5858#if H_MV
    5959#define NV_VERSION        "0.3"                 ///< Current software version
    60 #define HM_VERSION        "10.1"                ///<
     60#define HM_VERSION        "11.0"                ///<
    6161#else
    6262#define NV_VERSION        "10.1"                 ///< Current software version
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPic.h

    r539 r541  
    133133#endif
    134134#endif
    135 
    136135#if H_3D_QTLPC
    137136  Bool          getReduceBitsFlag ()             { return m_bReduceBitsQTL;     }
    138137  Void          setReduceBitsFlag ( Bool bFlag ) { m_bReduceBitsQTL = bFlag;    }
    139138#endif
    140 
    141139  Bool          getUsedByCurr()             { return m_bUsedByCurr; }
    142140  Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

    r539 r541  
    977977  Bool        m_bUsePC;
    978978#endif
    979 
    980979  // Parameter
    981980  Int         m_bitDepthY;
     
    11751174  Int  getMinHorizontalCtuOffsetPlus1 ( Int i )            { return m_minHorizontalCtuOffsetPlus1 [ i ];}
    11761175#endif
    1177 
    11781176#if H_3D_QTLPC
    11791177  Void setUseQTL( Bool b ) { m_bUseQTL = b;    }
     
    11821180  Bool getUsePC ()         { return m_bUsePC;  }
    11831181#endif
    1184 
    11851182#if H_3D
    11861183  Void initCamParaSPS      (  UInt uiViewIndex, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r539 r541  
    6969/////////////////////////////////////////////////////////////////////////////////////////
    7070#if H_MV
    71 #define H_MV_FIX1071                      1  //< Fix on Fix1071, same as in HTM 11
    72 #define H_MV_FIX_VPS_POINTER              1  //< Changed m_vps in TEncCfg to pointer to avoid mismatches between layers and avoid erroneous shallow copy.
    7371#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
    7472#endif
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r539 r541  
    745745    }
    746746#endif
    747 
    748747    ////   sps_extension_vui_parameters( ) END
    749748    READ_UVLC( uiCode, "sps_shvc_reserved_zero_idc" );
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecSbac.cpp

    r539 r541  
    823823
    824824  UInt uiSymbol;
    825 
    826825#if H_3D_QTLPC
    827826  Bool bParseSplitFlag    = true;
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

    r539 r541  
    551551    } 
    552552  }
    553 
    554553#if H_3D_QTLPC
    555554  if( depthFlag )
     
    559558  }
    560559#endif
    561 
    562560  ////   sps_extension_vui_parameters( ) END
    563561  WRITE_UVLC( 0, "sps_shvc_reserved_zero_idc" );
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCfg.h

    r539 r541  
    313313  Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
    314314  Bool      m_CUTransquantBypassFlagValue;                    ///< if transquant_bypass_enable_flag, the fixed value to use for the per-CU cu_transquant_bypass_flag.
    315 #if H_MV_FIX_VPS_POINTER
     315#if H_MV
    316316  TComVPS*  m_cVPS;                                           ///< pointer to VPS, same for all layers
    317317#else
     
    401401  Bool      m_useDLT;
    402402#endif
    403 
    404403#if H_3D_QTLPC
    405404  Bool      m_bUseQTL;
    406405  Bool      m_bUsePC;
    407406#endif
    408 
    409407#endif
    410408public:
     
    813811  Bool      getCUTransquantBypassFlagValue()          { return m_CUTransquantBypassFlagValue; }
    814812  Void      setCUTransquantBypassFlagValue(Bool flag) { m_CUTransquantBypassFlagValue = flag; }
    815 #if H_MV_FIX_VPS_POINTER
     813#if H_MV
    816814  Void      setVPS           ( TComVPS *p ) { m_cVPS = p;    }
    817815  TComVPS*  getVPS           ()             { return m_cVPS; }
     
    952950  Void      setUseDLT                       ( Bool b) { m_useDLT = b;    }
    953951#endif
    954 
    955952#if H_3D_QTLPC
    956953  Void      setUseQTL                       ( Bool b ) { m_bUseQTL = b;    }
     
    959956  Bool      getUsePC                        ()         { return m_bUsePC;  }
    960957#endif
    961 
    962958#endif // H_3D
    963959};
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCu.cpp

    r539 r541  
    400400  Bool bTryNx2N           = true;
    401401#endif
    402 
    403402  // get Original YUV data from picture
    404403  m_ppcOrigYuv[uiDepth]->copyFromPicYuv( pcPic->getPicYuvOrg(), rpcBestCU->getAddr(), rpcBestCU->getZorderIdxInCU() );
     
    494493
    495494      rpcTempCU->initEstData( uiDepth, iQP );
    496 
    497495#if H_3D_QTLPC
    498496      //logic for setting bTrySplit using the partition information that is stored of the texture colocated CU
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSbac.cpp

    r539 r541  
    730730{
    731731  PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
    732 
    733732#if H_3D_QTLPC
    734733  TComSPS *sps           = pcCU->getPic()->getSlice(0)->getSPS();
     
    751750  }
    752751#endif
    753 
    754752  if ( pcCU->isIntra( uiAbsPartIdx ) )
    755753  {
     
    10111009 
    10121010  assert( uiCtx < 3 );
    1013 
    10141011#if H_3D_QTLPC
    10151012  Bool bCodeSplitFlag    = true;
     
    10361033  }
    10371034#endif
    1038 
    10391035  m_pcBinIf->encodeBin( uiCurrSplitFlag, m_cCUSplitFlagSCModel.get( 0, 0, uiCtx ) );
    10401036#if !H_MV_ENC_DEC_TRAC
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

    r539 r541  
    16171617    rpcPic->setReduceBitsFlag(true);
    16181618#endif
    1619 
    16201619    TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );   
    16211620    if ( pcSlice->getSPS()->getUseSAO() && (pcSlice->getSaoEnabledFlag()||pcSlice->getSaoEnabledFlagChroma()) )
  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

    r539 r541  
    290290 
    291291  /* set the VPS profile information */
    292 #if H_MV_FIX_VPS_POINTER
     292#if H_MV
    293293  // This seems to be incorrect, but irrelevant for the MV-HEVC
    294294  *(m_cVPS->getPTL()) = *m_cSPS.getPTL();
     
    668668{
    669669#if H_MV
    670 #if H_MV_FIX_VPS_POINTER
    671670  if( getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
    672 #else
    673   if( m_cVPS.getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
    674 #endif
    675671  {
    676672    m_cPPS.setListsModificationPresentFlag( true );
Note: See TracChangeset for help on using the changeset viewer.