Changeset 363 in 3DVCSoftware for branches/HTM-DEV-0.1-dev


Ignore:
Timestamp:
3 May 2013, 15:59:14 (11 years ago)
Author:
tech
Message:

Fixed wrongly merged parts.

Location:
branches/HTM-DEV-0.1-dev/source
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r362 r363  
    115115  poc = -1;
    116116#endif
    117 
    118117  TComList<TComPic*>* pcListPic = NULL;
    119118
     
    147146  Bool firstSlice        = true;
    148147#endif
    149 
    150148 
    151149  while (!!bitstreamFile)
     
    296294      }
    297295      if ( bNewPicture &&
     296#endif
    298297           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
    299298            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r362 r363  
    7878#if !H_MV
    7979  m_aidQP = NULL;
     80#endif
    8081#if J0149_TONE_MAPPING_SEI
    8182  m_startOfCodedInterval = NULL;
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.h

    r362 r363  
    6060  Char*     m_pchInputFile;                                   ///< source file name
    6161#endif
    62 
    6362  Char*     m_pchBitstreamFile;                               ///< output bitstream file
    64 
    6563#if H_MV
    6664  std::vector<char*>     m_pchReconFileList;                  ///< output reconstruction file names
     
    6967  Char*     m_pchReconFile;                                   ///< output reconstruction file
    7068#endif
    71 
    72 
    7369  // VPS specification
    7470#if H_MV
     
    8379  std::vector<Int>       m_dimensionIdLen;                   ///< Length of scalability dimension s
    8480#endif
    85 
    86 
    8781  Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
    8882  // source specification
     
    10397  Level::Tier   m_levelTier;
    10498  Level::Name   m_level;
    105 
    10699#if L0046_CONSTRAINT_FLAGS
    107100  Bool m_progressiveSourceFlag;
     
    128121#else
    129122  Int       m_maxDecPicBuffering[MAX_TLAYER];                 ///< total number of reference pictures needed for decoding
     123#endif
    130124#endif
    131125#if !L0034_COMBINED_LIST_CLEANUP
     
    378372  Void  xPrintParameter ();                                   ///< print configuration values
    379373  Void  xPrintUsage     ();                                   ///< print usage
    380 
    381374#if H_MV
    382375  template <typename T>
     
    429422  Int*      m_constantPicRateIdc;                                ///< Indicates constant picture rate idc for various sub-layers
    430423#endif
    431  
    432424#if H_MV
    433425  Int   getGOPSize() { return m_iGOPSize; }
    434426#endif
    435 
    436427public:
    437428  TAppEncCfg();
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

    r362 r363  
    421421
    422422#if H_MV
    423 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr,std::vector<TComPic*>& refPicSetInterLayer )
     423Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& refPicSetInterLayer , Bool checkNumPocTotalCurr)
    424424#else
    425425#if FIX1071
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

    r362 r363  
    15841584#endif
    15851585#if H_MV
    1586   Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false , std::vector<TComPic*>& interLayerRefPicSet );
     1586  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& interLayerRefPicSet , Bool checkNumPocTotalCurr = false );
    15871587#else
    15881588#if FIX1071
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r362 r363  
    591591    // Set reference list
    592592#if H_MV   
    593     pcSlice->setRefPicList( m_cListPic, true, m_refPicSetInterLayer );   
     593    pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );   
    594594#else
    595595#if FIX1071
     
    782782    case NAL_UNIT_CODED_SLICE_RASL_N:
    783783    case NAL_UNIT_CODED_SLICE_RASL_R:
     784#if H_MV
     785      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag);
     786#else
    784787      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
     788#endif
    785789      break;
    786790    default:
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

    r362 r363  
    9797#if H_MV
    9898    ::memset( m_interViewRefs,   0, sizeof(m_interViewRefs) );
    99     ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );#endif
     99    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );
     100#endif
    100101  }
    101102};
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

    r362 r363  
    211211  }
    212212#endif
     213#endif
    213214#if H_MV
    214215   Void  xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid );
Note: See TracChangeset for help on using the changeset viewer.