Changeset 1305 in 3DVCSoftware


Ignore:
Timestamp:
29 Jul 2015, 12:12:44 (9 years ago)
Author:
tech
Message:

Further fixes and alignments.

Location:
branches/HTM-14.1-update-dev1/source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1/source/App/TAppEncoder/TAppEncCfg.cpp

    r1304 r1305  
    13601360  ("IlluCompEnable"        ,                          m_abUseIC                 , true                          , "Enable illumination compensation"          )
    13611361  ("IlluCompLowLatencyEnc" ,                          m_bUseLowLatencyICEnc     , false                         , "Enable low-latency illumination compensation encoding")
    1362 #endif //H_3D
     1362#endif //NH_3D
    13631363   
    13641364  ;
    … …  
    35993599  }
    36003600#endif //HHI_VSO
    3601 #endif //H_3D
     3601#endif //NH_3D
    36023602  printf("\n");
    36033603#if NH_MV

  • branches/HTM-14.1-update-dev1/source/App/TAppEncoder/TAppEncTop.cpp

    r1287 r1305  
    302302    m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL  : false );
    303303    m_cTEncTop.setSps3dExtension               ( m_sps3dExtension );
    304 #endif // H_3D
     304#endif // NH_3D
    305305
    306306    m_cTEncTop.setIvPicLists                   ( &m_ivPicLists );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/CommonDef.h

    r1287 r1305  
    391391#define STD_CAM_PARAMETERS_PRECISION 5        ///< quarter luma sample accuarcy for derived disparities (as default)
    392392
    393 #endif // end of H_3D
     393#endif // end of NH_3D
    394394//! \}
    395395

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.cpp

    r1304 r1305  
    36473647      !bARPFlag &&
    36483648#endif
    3649 #if H_3D
     3649#if H_3D || NH_3D_FIX_VSP
    36503650      (nPSW + nPSH > 12) &&
    36513651#endif
    … …  
    56275627    if(!m_pcSlice->getIsDepth())
    56285628    {
    5629 #if H_3D_DBBP
     5629#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    56305630      if (!getDBBPFlag(0))
    56315631#else
    … …  
    58035803      iCurrPosY  += ( iHeight >> 1 );
    58045804    }
    5805 #if H_3D_DBBP
     5805#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    58065806    for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++)
    58075807#else
    … …  
    58785878    }
    58795879#if NH_3D_SPIVMP
    5880 #if H_3D_DBBP
     5880#if H_3D_DBBP || NH_3D_ALIGN_SPIVMP_DBBP
    58815881    for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++)
    58825882#else

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.h

    r1285 r1305  
    5050#include "TComPattern.h"
    5151
    52 #if H_3D
    53 #include <algorithm>
    54 #include <vector>
    55 #endif
    56 
    5752//! \ingroup TLibCommon
    5853//! \{
    … …  
    504499#endif
    505500
    506 #if H_3D
    507   Void          getDispforDepth  ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp);
    508   Bool          getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm );
    509 #endif
    510501#if NH_3D_NBDV_REF
    511502  Pel           getMcpFromDM(TComPicYuv* pcBaseViewDepthPicYuv, TComMv* mv, Int iBlkX, Int iBlkY, Int iWidth, Int iHeight, Int* aiShiftLUT );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPic.cpp

    r1279 r1305  
    6262, m_layerId                               (0)
    6363, m_viewId                                (0)
    64 #if H_3D
     64#if NH_3D
    6565, m_viewIndex                             (0)
    6666, m_isDepth                               (false)

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPicYuv.cpp

    r1279 r1305  
    324324#endif
    325325
    326 #if H_3D
    327 Void TComPicYuv::setLumaTo( Pel pVal )
    328 {
    329   xSetPels( getLumaAddr(), getStride(), getWidth(), getHeight(), pVal );
    330 }
    331 #endif
    332326#if NH_3D_VSO
    333327Void TComPicYuv::setChromaTo( Pel pVal )

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPrediction.cpp

    r1287 r1305  
    584584    pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]);
    585585  }
    586 #if H_3D_ARP // check this!
     586#if H_3D_ARP || NH_3D_ALIGN_SPIVMP_RP // check this!
    587587  if( pcCU->getARPW( uiPartAddr ) != 0 )
    588588  {

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRom.cpp

    r1285 r1305  
    551551Bool g_decTraceMvFromMerge   = false;
    552552Bool g_decTracePicOutput     = false;
    553 Bool g_stopAtPos             = false;
     553Bool g_stopAtPos             = true;
    554554Bool g_outputPos             = false;   
    555555Bool g_traceCameraParameters = false;
    … …  
    686686  }
    687687  Bool stopFlag = false;
    688   if ( g_stopAtPos && poc == 16 && layerId == 5 )
     688  if ( g_stopAtPos && poc == 0 && layerId == 2 )
    689689  {
    690690    Bool stopAtCU = true;
    691691    if ( stopAtCU )        // Stop at CU with specific size
    692692    {   
    693       stopFlag = ( cuPelX  == 224 ) && ( cuPelY  == 128 ) && ( cuWidth == 16 ) && ( cuHeight == 16 );
     693      stopFlag = ( cuPelX  == 416 ) && ( cuPelY  == 632 ) && ( cuWidth == 8 ) && ( cuHeight == 8 );
    694694    }
    695695    else

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.cpp

    r1287 r1305  
    22342234  }
    22352235}
    2236 #endif // H_3D
     2236#endif // NH_3D
    22372237
    22382238
    … …  
    25032503    auxId         .push_back( getAuxId       ( i ) );     
    25042504    viewId        .push_back( getViewId      ( getLayerIdInNuh( i ) ) );
    2505 #if H_3D 
     2505#if NH_3D 
    25062506    depthId.push_back( getDepthId( i ) );
    25072507#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.h

    r1287 r1305  
    30943094  Bool                        inferPocMsbValPresentFlag();
    30953095#endif
    3096 #if H_3D
    3097   Int                         getDefaultRefViewIdx()                                 { return m_iDefaultRefViewIdx;                                  }
    3098   Void                        setDefaultRefViewIdx(Int iViewIdx)                     { m_iDefaultRefViewIdx = iViewIdx;                              }
    3099 
    3100   Bool                        getDefaultRefViewIdxAvailableFlag()                    { return m_bDefaultRefViewIdxAvailableFlag;                     }
    3101   Void                        setDefaultRefViewIdxAvailableFlag(Bool bViewIdx)       { m_bDefaultRefViewIdxAvailableFlag = bViewIdx;                 }
    3102   Void                        setDefaultRefView( );
    3103 #endif
    31043096protected:
    31053097  TComPic*                    xGetRefPic        (TComList<TComPic*>& rcListPic, Int poc);

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

    r1304 r1305  
    6666/////////////////////////////////////////////////////////////////////////////////////////
    6767#if NH_MV
     68#define NH_3D_DLT_FIX                     1 // Fixes numbers of parsed DLTs
     69#define H_MV_VER141_DEC_COMP_FLAG         1 // Makes decoding of this version compatible to HTM-14.1 by re-introducing HTM-14.1 bugs.
     70#define NH_3D_ALIGN_SPIVMP_DBBP           1 // Further alignment of DBBP and SBP motion
     71#define NH_3D_ALIGN_SPIVMP_RP             1 // Alignment of DBBP and RP
     72#define NH_3D_FIX_VSP                     1
     73
    6874#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
    6975#define H_MV_ENC_DEC_TRAC_FIX             1  // by SHARP
    … …  
    11491155};
    11501156//! \}
    1151 #if H_3D
    1152 #define !!! REMOVE THIS !!! Log2( n ) ( log((double)n) / log(2.0) ) // Ed.(GT): This is very very bad and should be fixed to used integer arithmetics ( see gCeilLog2 ) moreover it should not be defined in the tool macro section!
    1153 #endif
    1154 #endif
     1157#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1304 r1305  
    507507  {
    508508    READ_CODE(6, uiCode, "pps_depth_layers_minus1");
     509#if H_MV_VER141_DEC_COMP_FLAG
     510    pcDLT->setNumDepthViews( uiCode );
     511#else
    509512    pcDLT->setNumDepthViews( uiCode+1 );
     513#endif
    510514   
    511515    READ_CODE(4, uiCode, "pps_bit_depth_for_depth_layers_minus8");
    512516    pcDLT->setDepthViewBitDepth( (uiCode+8) );
    513517   
     518#if NH_3D_DLT_FIX
     519    for( Int i = 0; i <= pcDLT->getNumDepthViews()-1; i++ )
     520#else
    514521    for( Int i = 0; i <= pcDLT->getNumDepthViews(); i++ )
     522#endif
    515523    {
    516524      Int layerId = pcDLT->getDepthIdxToLayerId(i);

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCu.cpp

    r1304 r1305  
    923923    }
    924924   
    925 #if H_3D
     925#if NH_3D
    926926    AOF( pcCU->getARPW(uiPartAddr) == 0 );
    927927    AOF( pcCU->getICFlag(uiPartAddr) == false );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSbac.h

    r1304 r1305  
    7979  Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
    8080  Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
    81 #if H_3D
    82   Void  parsePPS                  ( TComPPS* /*pcPPS*/, TComVPS* /*pcVPS*/ ) {}
    83 #else
    8481  Void  parsePPS                  ( TComPPS* /*pcPPS*/ ) {}
    85 #endif
    8682  Void  parseSliceHeader          ( TComSlice* /*pcSlice*/, ParameterSetManager* /*parameterSetManager*/, const Int /*prevTid0POC*/) {}
    8783  Void  parseTerminatingBit       ( UInt& ruiBit );

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecSlice.cpp

    r1279 r1305  
    130130    }
    131131  }
    132 #if  H_3D
     132#if  NH_3D_DLT
    133133  if( pcSlice->getPPS()->getDLT() != NULL )
    134134  {
    135       assert( pcSlice->getSPS()->getBitDepthY() == pcSlice->getPPS()->getDLT()->getDepthViewBitDepth() );
     135      assert( pcSlice->getSPS()->getBitDepth( CHANNEL_TYPE_LUMA ) == pcSlice->getPPS()->getDLT()->getDepthViewBitDepth() );
    136136  }
    137137#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.cpp

    r1279 r1305  
    13141314  pps->setLayerId( getLayerId() );
    13151315#endif
    1316 #if H_3D
    1317   // GT: Please don't add parsing dependency of SPS from VPS here again!!!
    1318 #endif
    13191316#if NH_3D_DLT
    13201317  // create mapping from depth layer indexes to layer ids

  • branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.h

    r1279 r1305  
    176176};
    177177
    178 #endif //H_3D
     178#endif //NH_3D
    179179/// decoder class
    180180class TDecTop

  • branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1304 r1305  
    380380    WRITE_CODE((pcPPS->getDLT()->getDepthViewBitDepth() - 8), 4, "pps_bit_depth_for_depth_layers_minus8");
    381381   
     382#if NH_3D_DLT_FIX
     383    for( Int i = 0; i <= pcPPS->getDLT()->getNumDepthViews()-1; i++ )
     384#else
    382385    for( Int i = 0; i <= pcPPS->getDLT()->getNumDepthViews(); i++ )
     386#endif
    383387    {
    384388      Int layerId = pcPPS->getDLT()->getDepthIdxToLayerId(i);

  • branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncCu.cpp

    r1304 r1305  
    22542254
    22552255  // prior to this, rpcTempCU will have just been reset using rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
    2256 #if H_3D || NH_3D_ARP
     2256#if NH_3D_ARP
    22572257  const Bool bTransquantBypassFlag = rpcTempCU->getCUTransquantBypass(0);
    22582258#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibExtractor/TExtrTop.cpp

    r1200 r1305  
    7474  {
    7575     TComSPS     cSPS;
    76 #if H_3D
    77 
    7876     m_cEntropyDecoder   .decodeSPS( &cSPS );
    79 #else
    80      m_cEntropyDecoder   .decodeSPS( &cSPS );
    81 #endif
    8277     m_acSPSBuffer       .push_back( cSPS );
    8378  }
    … …  
    111106    rcVpsInfoHandle << "LayerIdInNuh   = " << layerId                             << std::endl;
    112107    rcVpsInfoHandle << "ViewOrderIndex = " << m_cVPS.getViewIndex     ( layerId ) << std::endl;     
    113 #if H_3D   
    114108    rcVpsInfoHandle << "DepthFlag      = " << m_cVPS.getDepthId       ( layerId ) << std::endl;     
    115 #endif
    116109    rcVpsInfoHandle << "ViewId         = " << m_cVPS.getViewId        ( layerId ) << std::endl;     
    117110  }
Note: See TracChangeset for help on using the changeset viewer.