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

Further cleanups

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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" );
Note: See TracChangeset for help on using the changeset viewer.