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


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

Further minor cleanups.

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

Legend:

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

    r364 r365  
    5858protected:
    5959  Char*         m_pchBitstreamFile;                   ///< input bitstream file name
    60 
    6160#if H_MV
    6261  Int           m_maxLayerId;                         ///< maximum nuh_layer_id decoded
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r364 r365  
    156156    Bool bPreviousPictureDecoded = false;
    157157#endif
     158
    158159    vector<uint8_t> nalUnit;
    159160    InputNALUnit nalu;
     
    272273    }
    273274#endif
     275
    274276    if( pcListPic )
    275277    {
     
    282284        if (!m_outputBitDepthY) { m_outputBitDepthY = g_bitDepthY; }
    283285        if (!m_outputBitDepthC) { m_outputBitDepthC = g_bitDepthC; }
     286
    284287#if H_MV
    285288        m_tVideoIOYuvReconFile[decIdxLastPic]->open( m_pchReconFiles[decIdxLastPic], true, m_outputBitDepthY, m_outputBitDepthC, g_bitDepthY, g_bitDepthC ); // write mode
  • branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.h

    r364 r365  
    7474  // for output control
    7575  Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
    76 
    7776#if H_MV
    7877  Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r364 r365  
    142142  free(m_pRowHeight);
    143143  free(m_scalingListFile);
    144 
    145144#if H_MV
    146145  for( Int i = 0; i < m_GOPListMvc.size(); i++ )
     
    321320  string cfg_InputFile;
    322321#endif
    323 
    324322  string cfg_BitstreamFile;
    325 
    326323#if !H_MV
    327324  string cfg_ReconFile;
    328325#endif
    329 
    330326#if H_MV
    331327  vector<Int>   cfg_dimensionLength;
     
    386382  ("SplittingFlag",         m_splittingFlag      , false                , "Splitting Flag")   
    387383#endif
    388 
    389384  ("SourceWidth,-wdt",      m_iSourceWidth,        0, "Source picture width")
    390385  ("SourceHeight,-hgt",     m_iSourceHeight,       0, "Source picture height")
     
    743738   */
    744739  /* convert std::string to c string for compatability */
    745 
    746740#if !H_MV
    747741  m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
    748742#endif
    749 
    750743  m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
    751 
    752744#if !H_MV
    753745  m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
     
    14651457      Int*      m_numReorderPics     = m_numReorderPicsMvc    [layer]; // It is not a member, but this name helps avoiding code duplication !!!
    14661458#endif
    1467 
    14681459  /* if this is an intra-only sequence, ie IntraPeriod=1, don't verify the GOP structure
    14691460   * This permits the ability to omit a GOP structure specification */
     
    19411932  }
    19421933#endif
    1943 
    19441934#if H_MV
    19451935  }
  • branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r364 r365  
    111111  }
    112112#endif
    113 
    114113#if H_MV
    115114  xSetLayerIds             ( vps );   
     
    185184#endif
    186185  m_cTEncTop.setPad                          ( m_aiPad );
    187    
    188186#if H_MV
    189187  m_cTEncTop.setMaxTempLayer                 ( m_maxTempLayerMvc[layer] );
     
    727725 .
    728726 */
    729 
    730727#if H_MV
    731728Void TAppEncTop::xGetBuffer( TComPicYuv*& rpcPicYuvRec, UInt layer)
     
    755752
    756753  }
    757 
    758754#if H_MV
    759755  m_picYuvRec[layer]->pushBack( rpcPicYuvRec );
     
    765761Void TAppEncTop::xDeleteBuffer( )
    766762{
    767 
    768763#if H_MV
    769764  for(Int layer=0; layer<m_picYuvRec.size(); layer++)
  • branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h

    r364 r365  
    282282    }
    283283#endif
    284 
    285284    /** Option class for argument handling using a user provided function */
    286285    struct OptionFunc : public OptionBase
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.cpp

    r324 r365  
    481481#endif
    482482
     483
    483484//! \}
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp

    r362 r365  
    414414  eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
    415415#endif
     416
    416417  rpcSlice->setSliceType        ( eSliceType );
    417418#endif
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r362 r365  
    438438  m_iNumPicRcvd       = 0;
    439439  m_uiNumAllPicCoded += iNumEncoded;
    440 
    441440#if H_MV
    442441}
    443442#endif
    444 
    445443}
    446444
Note: See TracChangeset for help on using the changeset viewer.