Changeset 483 in 3DVCSoftware for branches/HTM-DEV-0.3-dev0


Ignore:
Timestamp:
19 Jun 2013, 17:57:12 (11 years ago)
Author:
tech
Message:

Merged fixes from other dev-branches.

Location:
branches/HTM-DEV-0.3-dev0/source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev0/source/App/TAppDecoder/TAppDecCfg.h

    r446 r483  
    8484#if H_MV
    8585  , m_maxLayerId(0)
    86   , m_pchReconFiles(NULL)
    8786#endif
    8887  , m_pchReconFile(NULL)
  • branches/HTM-DEV-0.3-dev0/source/App/TAppDecoder/TAppDecTop.cpp

    r446 r483  
    9595    m_pchReconFile = NULL;
    9696  }
     97#if H_3D_FIX
     98  if (m_pchScaleOffsetFile)
     99  {
     100    free (m_pchScaleOffsetFile);
     101    m_pchScaleOffsetFile = NULL;
     102  }
     103#endif
    97104}
    98105
  • branches/HTM-DEV-0.3-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp

    r446 r483  
    965965  //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
    966966  Double        dCamPosShift, dPicPosShift;
     967#if H_3D_PDM_CAM_PARAS
    967968  Int           iMinVOI       = (1<<30);
     969#endif
    968970  Int           iMinAbsVOI    = (1<<30);
    969971  Int           iMinAbsVOIId  = 0;
     
    973975    if( iAbsVOI < iMinAbsVOI )
    974976    {
     977#if H_3D_PDM_CAM_PARAS
    975978      iMinVOI      = m_aiViewOrderIndex[ iBaseId ];
     979#endif
    976980      iMinAbsVOI   = iAbsVOI;
    977981      iMinAbsVOIId = iBaseId;
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TypeDef.h

    r446 r483  
    7878                                              // SAIT_VSO_EST_A0033, JCT3V-A0033 modification 3
    7979                                              // LGE_WVSO_A0119
     80#define H_3D_FIX                          1   // Temporary for minor fixes
    8081#endif
    8182
     
    9192#define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
    9293#define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
     94#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification
    9395#endif
    9496
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r446 r483  
    25762576     
    25772577#if H_3D_VSO // M35
     2578#if H_3D_VSO_FIX // This fix should be enabled after verification
    25782579        Double dLambda;
    25792580        if ( m_pcRdCost->getUseLambdaScaleVSO() )
     
    25832584
    25842585        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2586#else
     2587        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2588#endif
    25852589#else
    25862590        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
Note: See TracChangeset for help on using the changeset viewer.