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


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

Further cleanups

Location:
branches/HTM-DEV-0.1-dev/source/App
Files:
8 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 );
Note: See TracChangeset for help on using the changeset viewer.