Changeset 473 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1


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

Included fixes for memory leaks and gcc-4.6.3 compiler warnings.

Location:
branches/HTM-DEV-0.3-dev1/source
Files:
8 edited

Legend:

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

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

    r459 r473  
    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
     
    146153  Int  pocLastPic        = -MAX_INT;   
    147154 
    148   Int  layerIdLastPic    = 0;
    149155  Int  layerIdCurrPic    = 0;
    150156
     
    223229        if ( bNewPicture || !bitstreamFile )
    224230        {
    225           layerIdLastPic    = layerIdCurrPic; 
    226231          layerIdCurrPic    = nalu.m_layerId;
    227232         
  • branches/HTM-DEV-0.3-dev1/source/Lib/TAppCommon/TAppComCamPara.cpp

    r446 r473  
    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-dev1/source/Lib/TLibCommon/TComSlice.cpp

    r467 r473  
    15211521 
    15221522#if H_3D_DIM_DLT
    1523   Void TComVPS::setDepthLUTs(Int layerIdInVps, Int* idx2DepthValue, Int iNumDepthValues)
    1524   {
    1525     if( idx2DepthValue == NULL || iNumDepthValues == 0 ) // default mapping only
     1523  Void TComVPS::setDepthLUTs(Int layerIdInVps, Int* idxToDepthValueTable, Int iNumDepthValues)
     1524  {
     1525    if( idxToDepthValueTable == NULL || iNumDepthValues == 0 ) // default mapping only
    15261526      return;
    15271527   
    15281528    // copy idx2DepthValue to internal array
    1529     memcpy(m_iIdx2DepthValue[layerIdInVps], idx2DepthValue, iNumDepthValues*sizeof(UInt));
     1529    memcpy(m_iIdx2DepthValue[layerIdInVps], idxToDepthValueTable, iNumDepthValues*sizeof(UInt));
    15301530   
    15311531    UInt uiMaxDepthValue = ((1 << g_bitDepthY)-1);
  • branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TypeDef.h

    r467 r473  
    8888                                              // PKU_QC_DEPTH_INTRA_UNI_D0195
    8989                                              // RWTH_SDC_DLT_B0036
     90#define H_3D_FIX                          1   // Temporary for minor fixes
    9091#endif
    9192
     
    101102#define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
    102103#define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
     104#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification
    103105#endif
    104106
  • branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecTop.cpp

    r459 r473  
    5252  m_aaiCodedScale          = new Int* [ MAX_NUM_LAYERS ];
    5353  m_aiViewId               = new Int  [ MAX_NUM_LAYERS ];
     54#if !H_3D_FIX 
    5455  m_aiLayerIdx             = new Int  [ MAX_NUM_LAYERS ];
     56#endif
    5557
    5658  m_bViewReceived          = new Bool [ MAX_NUM_LAYERS ];
  • branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecTop.h

    r446 r473  
    8989  Int**   m_aaiCodedScale;
    9090  Int*    m_aiViewId; 
     91#if !H_3D_FIX 
    9192  Int*    m_aiLayerIdx;
     93#endif
    9294
    9395  Bool*   m_bViewReceived;
  • branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp

    r471 r473  
    27872787     
    27882788#if H_3D_VSO // M35
     2789#if H_3D_VSO_FIX // This fix should be enabled after verification
    27892790        Double dLambda;
    27902791        if ( m_pcRdCost->getUseLambdaScaleVSO() )
     
    27942795
    27952796        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2797#else
     2798        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
     2799#endif
    27962800#else
    27972801        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
Note: See TracChangeset for help on using the changeset viewer.