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


Ignore:
Timestamp:
3 May 2013, 16:34:51 (11 years ago)
Author:
tech
Message:

Further cleanups

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

Legend:

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

    r324 r364  
    4545#include <cassert>
    4646#endif
    47 
    4847#ifdef WIN32
    4948#define strdup _strdup
     
    7978  ("OutputBitDepth,d", m_outputBitDepthY, 0, "bit depth of YUV output luma component (default: use 0 for native depth)")
    8079  ("OutputBitDepthC,d", m_outputBitDepthC, 0, "bit depth of YUV output chroma component (default: use 0 for native depth)")
    81 
    8280#if H_MV
    8381  ("MaxLayerId,-ls", m_maxLayerId, MAX_NUM_LAYER_IDS-1, "Maximum LayerId to be decoded.")
    8482#endif
    85 
    8683  ("MaxTemporalLayer,t", m_iMaxTemporalLayer, -1, "Maximum Temporal Layer to be decoded. -1 to decode all layers")
    8784  ("SEIDecodedPictureHash", m_decodedPictureHashSEIEnabled, 1, "Control handling of decoded picture hash SEI messages\n"
     
    108105  /* convert std::string to c string for compatability */
    109106  m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
    110 
    111107  m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
    112108
     
    191187}
    192188#endif
    193 
    194189//! \}
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecCfg.h

    r324 r364  
    6464#endif
    6565  Char*         m_pchReconFile;                       ///< output reconstruction file name
    66 
    6766  Int           m_iSkipFrame;                         ///< counter for frames prior to the random access point to skip
    6867  Int           m_outputBitDepthY;                    ///< bit depth used for writing output (luma)
     
    7877  Void xAppendToFileNameEnd( Char* pchInputFileName, const Char* pchStringToAppend, Char*& rpchOutputFileName); ///< create filenames
    7978#endif
    80 
    8179public:
    8280  TAppDecCfg()
    8381  : m_pchBitstreamFile(NULL)
    84 
    8582#if H_MV
    8683  , m_maxLayerId(0)
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r363 r364  
    6060: m_numDecoders( 0 )
    6161#endif
    62 
    6362{
    6463  ::memset (m_abDecFlag, 0, sizeof (m_abDecFlag));
     
    7978    m_pchBitstreamFile = NULL;
    8079  }
    81 
    8280#if H_MV
    8381  for (Int decIdx = 0; decIdx < m_numDecoders; decIdx++)
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.h

    r324 r364  
    9090  Void  decode            (); ///< main decoding function
    9191 
    92 
    9392protected:
    9493  Void  xCreateDecLib     (); ///< create internal classes
     
    153152  Void  xFlushOutput      ( TComList<TComPic*>* pcListPic ); ///< flush all remaining decoded pictures to file
    154153#endif
    155 
    156154  Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
    157155};
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r363 r364  
    107107    delete[] m_aidQP;
    108108  }
    109   free(m_pchInputFile);
    110109#endif
    111110#if J0149_TONE_MAPPING_SEI
     
    126125  }
    127126#endif
     127#if !H_MV
     128  free(m_pchInputFile);
     129#endif
    128130  free(m_pchBitstreamFile);
    129 
    130131#if H_MV
    131132  for(Int i = 0; i< m_pchReconFileList.size(); i++ )
     
    137138  free(m_pchReconFile);
    138139#endif
    139 
    140140  free(m_pchdQPFile);
    141141  free(m_pColumnWidth);
     
    337337#endif
    338338#endif
    339 
    340339  string cfg_dQPFile;
    341340  string cfg_ColumnWidth;
     
    361360 
    362361  // File, I/O and source parameters
    363 
    364362#if H_MV
    365363  ("InputFile_%d,i_%d",       m_pchInputFileList,       (char *) 0 , MAX_NUM_LAYER_IDS , "original Yuv input file name %d")
     
    367365  ("InputFile,i",           cfg_InputFile,     string(""), "Original YUV input file name")
    368366#endif
    369 
    370367  ("BitstreamFile,b",       cfg_BitstreamFile, string(""), "Bitstream output file name")
    371 
    372368#if H_MV
    373369  ("ReconFile_%d,o_%d",       m_pchReconFileList,       (char *) 0 , MAX_NUM_LAYER_IDS , "reconstructed Yuv output file name %d")
     
    375371  ("ReconFile,o",           cfg_ReconFile,     string(""), "Reconstructed YUV output file name")
    376372#endif
    377 
    378373#if H_MV
    379374  ("NumberOfLayers",        m_numberOfLayers     , 1,                     "Number of layers")
     
    413408
    414409  // Profile and level
    415 
    416410  ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
    417411  ("Level",   m_level,     Level::NONE,   "Level limit to be used, eg 5.1 (Incomplete)")
     
    730724  }
    731725#endif
    732 
    733726  po::setDefaults(opts);
    734727  const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv);
     
    760753  m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
    761754#endif
    762 
    763755  m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
    764756 
     
    824816  free ( pRowHeight   );
    825817#endif
    826 
    827818#if SIGNAL_BITRATE_PICRATE_IN_VPS
    828819  readBoolString(cfg_bitRateInfoPresentFlag, m_bitRatePicRateMaxTLayers, m_bitRateInfoPresentFlag, "bit rate info. present flag" );
     
    11421133  xConfirmPara( m_iFrameRate <= 0,                                                          "Frame rate must be more than 1" );
    11431134  xConfirmPara( m_framesToBeEncoded <= 0,                                                   "Total Number Of Frames encoded must be more than 0" );
    1144 
    11451135#if H_MV
    11461136  xConfirmPara( m_numberOfLayers > MAX_NUM_LAYER_IDS ,                                      "NumberOfLayers must be less than or equal to MAX_NUM_LAYER_IDS");
     
    11551145  xConfirmPara( m_scalabilityMask != 1 , "Scalability Mask must be equal to 1. ");
    11561146#endif
    1157   
     1147 
    11581148  m_dimIds.push_back( m_viewId );
    11591149#if H_3D
     
    12121202
    12131203#endif
    1214 
    1215 
    12161204  xConfirmPara( m_iGOPSize < 1 ,                                                            "GOP Size must be greater or equal to 1" );
    12171205  xConfirmPara( m_iGOPSize > 1 &&  m_iGOPSize % 2,                                          "GOP Size must be a multiple of 2, if GOP Size is greater than 1" );
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r362 r364  
    136136    m_cTEncTop.setIvPicLists  ( &m_ivPicLists );
    137137#endif
    138 
    139138  m_cTEncTop.setVPS(&vps);
    140139
    141140  m_cTEncTop.setProfile(m_profile);
    142141  m_cTEncTop.setLevel(m_levelTier, m_level);
    143 
    144142#if L0046_CONSTRAINT_FLAGS
    145143  m_cTEncTop.setProgressiveSourceFlag(m_progressiveSourceFlag);
     
    462460  }
    463461#endif
    464 
    465 #if H_MV
    466   }
    467 #endif
    468 
     462#if H_MV
     463  }
     464#endif
    469465}
    470466
     
    721717}
    722718#endif
    723 
    724719// ====================================================================================================================
    725720// Protected member functions
     
    795790  }
    796791#endif 
    797 
    798792}
    799793
     
    825819  {
    826820    TComPicYuv*  pcPicYuvRec  = *(iterPicYuvRec++);
    827 
    828821#if H_MV
    829822      if (m_pchReconFileList[layerId])
     
    853846  }
    854847#endif
    855 
    856848}
    857849
     
    899891void TAppEncTop::printRateSummary()
    900892{
    901 
    902893#if H_MV
    903894  Double time = (Double) m_frameRcvd[0] / m_iFrameRate;
     
    906897  Double time = (Double) m_iFrameRcvd / m_iFrameRate;
    907898#endif
    908 
    909899  printf("Bytes written to file: %u (%.3f kbps)\n", m_totalBytes, 0.008 * m_totalBytes / time);
    910900#if VERBOSE_RATE
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.h

    r324 r364  
    5959private:
    6060  // class interface
    61 
    6261#if H_MV
    6362  std::vector<TEncTop*>      m_acTEncTopList ;              ///< encoder class per layer
     
    10099 
    101100  // file I/O
    102 
    103101#if H_MV
    104102  Void xWriteOutput(std::ostream& bitstreamFile, Int iNumEncoded, std::list<AccessUnit>& accessUnits, UInt layerId); ///< write bitstream to file
     
    106104  Void xWriteOutput(std::ostream& bitstreamFile, Int iNumEncoded, const std::list<AccessUnit>& accessUnits); ///< write bitstream to file
    107105#endif
    108 
    109106  void rateStatsAccum(const AccessUnit& au, const std::vector<UInt>& stats);
    110107  void printRateSummary();
     
    116113  Int  xGetMax( std::vector<Int>& vec);
    117114#endif
    118 
    119115public:
    120116  TAppEncTop();
     
    122118 
    123119  Void        encode      ();                               ///< main encoding function
    124 
    125120#if H_MV
    126121  TEncTop*    getTEncTopLayer(UInt layer) { return  m_acTEncTopList[layer]; }  ///< return pointer to encoder class for specific layer
     
    131126  TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
    132127#endif
    133 
    134128};// END CLASS DEFINITION TAppEncTop
    135129
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/encmain.cpp

    r324 r364  
    6262  fprintf( stdout, "HM software: Encoder Version [%s]", NV_VERSION );
    6363#endif
    64 
    6564  fprintf( stdout, NVM_ONOS );
    6665  fprintf( stdout, NVM_COMPILEDBY );
  • branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h

    r324 r364  
    4646#endif
    4747#endif
    48 
    4948//! \ingroup TAppCommon
    5049//! \{
     
    382381      }
    383382#endif
    384 
    385383      /**
    386384       * Add option described by name to the parent Options list,
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h

    r362 r364  
    168168
    169169#endif
    170 
    171170
    172171// ====================================================================================================================
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h

    r362 r364  
    4747  NalUnitType m_nalUnitType; ///< nal_unit_type
    4848  UInt        m_temporalId;  ///< temporal_id
    49 
    5049#if H_MV
    5150  Int         m_layerId;     ///< layer id
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r324 r364  
    32003200  Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
    32013201  Bool bIsNeibRefLongTerm = false;
    3202 
    32033202  //---------------  V1 (END) ------------------//
    32043203  if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0)
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h

    r324 r364  
    9393#endif
    9494#endif
    95 
    9695public:
    9796  TComPic();
     
    116115#endif
    117116#endif
    118 
    119117  Bool          getUsedByCurr()             { return m_bUsedByCurr; }
    120118  Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }
     
    186184  Void          print( Bool legend );
    187185#endif
    188 
    189 
    190 
    191186  /** transfer ownership of seis to this picture */
    192187  void setSEIs(SEIMessages& seis) { m_SEIs = seis; }
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

    r363 r364  
    603603  TimingInfo* getTimingInfo() { return &m_timingInfo; }
    604604#endif
    605 
    606605#if H_MV
    607606  Void    setAvcBaseLayerFlag( Bool val )                                  { m_avcBaseLayerFlag = val;  }
     
    971970  static const Int   m_winUnitY[MAX_CHROMA_FORMAT_IDC+1];
    972971  TComPTL     m_pcPTL;
    973 
    974972#if H_MV
    975973  Bool        m_interViewMvVertConstraintFlag;
    976974#endif
    977 
    978975public:
    979976  TComSPS();
     
    11061103
    11071104  TComPTL* getPTL()     { return &m_pcPTL; }
    1108 
    11091105#if H_MV
    11101106  Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; }
     
    14641460
    14651461  Bool       m_enableTMVPFlag;
    1466 
    14671462#if H_MV
    14681463  Int        m_layerId;
     
    14721467#endif
    14731468#endif
    1474 
    14751469public:
    14761470  TComSlice();
     
    16391633  Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum );
    16401634  Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
    1641 
    16421635#if H_MV
    16431636  Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer );
     
    16481641  Void xPrintRefPicList();
    16491642#endif
    1650 
    16511643  Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic );
    16521644  Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h

    r362 r364  
    9191#define MAX_VPS_NUM_HRD_PARAMETERS                1
    9292#define MAX_VPS_OP_SETS_PLUS1                     1024
    93 
    9493#if H_MV
    9594#define MAX_VPS_NUH_LAYER_ID_PLUS1  64
     
    105104#define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
    106105#define MAX_NUM_LAYER_IDS               64
     106#if H_MV
    107107#define MAX_NUM_LAYERS                  64
     108#endif
    108109
    109110#define COEF_REMAIN_BIN_REDUCTION        3 ///< indicates the level at which the VLC
     
    569570#endif
    570571#endif
    571 
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp

    r324 r364  
    208208  rpcPic->compressMotion();
    209209#endif
    210 
    211210  Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
    212211  if (!pcSlice->isReferenced()) c += 32;
    213212
    214213  //-- For time output for each slice
    215 
    216214#if H_MV
    217215  printf("\nLayer %2d   POC %4d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getLayerId(),
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r363 r364  
    9393}
    9494
    95 
    9695Void TDecTop::init()
    9796{
     
    10099  initROM();
    101100#endif
    102 
    103101  m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO);
    104102  m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
     
    222220  rpcListPic          = &m_cListPic; 
    223221  m_cCuDecoder.destroy();       
    224 
    225222#if H_MV
    226223  TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer ); 
    227224  TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc );
    228225#endif
    229 
    230226  m_bFirstSliceInPicture  = true;
    231227
     
    380376  m_apcSlicePilot->setLayerId( nalu.m_layerId );
    381377#endif
    382 
    383378  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
    384379
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h

    r324 r364  
    6464class TAppDecTop;
    6565#endif
    66 
    6766/// decoder class
    6867class TDecTop
     
    8180  ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets
    8281#endif
    83 
    8482  TComSlice*              m_apcSlicePilot;
    8583 
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

    r363 r364  
    406406#endif
    407407#endif
    408 
    409408  //====== Coding Structure ========
    410409  Void      setIntraPeriod                  ( Int   i )      { m_uiIntraPeriod = (UInt)i; }
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r362 r364  
    410410  UInt *accumNalsDU = NULL;
    411411  SEIDecodingUnitInfo decodingUnitInfoSEI;
    412 
    413412#if !H_MV
    414413  for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
     
    472471    if(pocCurr>=m_pcCfg->getFramesToBeEncoded())
    473472    {
    474 
    475473#if H_MV
    476474      delete pcBitstreamRedirect;
     
    20572055  assert ( m_iNumPicCoded == iNumPicRcvd );
    20582056#endif
    2059 
    20602057}
    20612058
     
    23772374  m_gcAnalyzeAll.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
    23782375#endif
    2379 
    23802376  TComSlice*  pcSlice = pcPic->getSlice(0);
    23812377  if (pcSlice->isIntra())
     
    23862382    m_gcAnalyzeI.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
    23872383#endif
    2388 
    23892384  }
    23902385  if (pcSlice->isInterP())
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

    r363 r364  
    108108#endif
    109109#endif
    110 
    111110  //--Adaptive Loop filter
    112111  TEncSampleAdaptiveOffset*  m_pcSAO;
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h

    r362 r364  
    6363// Class definition
    6464// ====================================================================================================================
    65 
    66 
    6765
    6866/// encoder class
     
    133131  TEncAnalyze             m_cAnalyzeB; 
    134132#endif
    135 
    136133protected:
    137134  Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
     
    148145  Void      create          ();
    149146  Void      destroy         ();
    150 
    151147  Void      init            ();
    152 
    153148#if H_MV 
    154149  TComPicLists* getIvPicLists() { return m_ivPicLists; }
    155150#endif
    156 
    157151  Void      deletePicBuffer ();
    158152
     
    162156  Void      initNewPic(TComPicYuv* pcPicYuvOrg);
    163157#endif
    164 
    165158  // -------------------------------------------------------------------------------------------------------------------
    166159  // member access functions
Note: See TracChangeset for help on using the changeset viewer.