Changeset 195 in 3DVCSoftware for branches/HTM-5.0-Qualcomm/source/App


Ignore:
Timestamp:
26 Nov 2012, 22:32:00 (12 years ago)
Author:
tech
Message:

Changed macro switch names to match conventions.

Location:
branches/HTM-5.0-Qualcomm/source/App
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.cpp

    r194 r195  
    8282Void TAppDecTop::decode()
    8383{
    84 #if VIDYO_VPS_INTEGRATION|MVHEVC
     84#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    8585  increaseNumberOfViews( 0, 0, 0 );
    8686#else
    … …  
    145145    {
    146146      read(nalu, nalUnit);
    147 #if MVHEVC
     147#if QC_MVHEVC_B0046
    148148    viewDepthId = nalu.m_layerId;
    149149    Int depth = 0;
    … …  
    171171      if( viewDepthId >= m_tDecTop.size() )     
    172172      {
    173 #if VIDYO_VPS_INTEGRATION|MVHEVC
     173#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    174174        increaseNumberOfViews( viewDepthId, viewId, depth );
    175175#else
    … …  
    200200      if( !(m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) )
    201201      {
    202 #if MVHEVC
     202#if QC_MVHEVC_B0046
    203203        if(viewDepthId && m_tDecTop[viewDepthId]->m_bFirstNal== false)
    204204        {
    … …  
    233233    if( pcListPic[viewDepthId] )
    234234    {
    235 #if QC_REM_IDV
     235#if QC_REM_IDV_B0046
    236236      Int iviewId = m_tDecTop[viewDepthId]->getViewId();
    237237      if( newPicture[viewDepthId] && (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || ((nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR && iviewId) && m_tDecTop[viewDepthId]->getNalUnitTypeBaseView() == NAL_UNIT_CODED_SLICE_IDR)) )
    … …  
    295295        m_tDecTop[viewDepthIdx]->destroy() ;
    296296      }
    297 #if MVHEVC
     297#if QC_MVHEVC_B0046
    298298      if(viewDepthIdx)
    299299      {
    … …  
    445445  m_pocLastDisplay[viewDepthId] = -MAX_INT;
    446446}
    447 #if VIDYO_VPS_INTEGRATION|MVHEVC
     447#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    448448Void  TAppDecTop::increaseNumberOfViews  ( UInt layerId, UInt viewId, UInt isDepth )
    449449#else
    … …  
    451451#endif
    452452{
    453 #if VIDYO_VPS_INTEGRATION|MVHEVC
     453#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    454454  Int newNumberOfViewDepth = layerId + 1;
    455455#endif
    … …  
    458458    m_outputBitDepth = g_uiBitDepth + g_uiBitIncrement;
    459459  }
    460 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     460#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    461461  Int viewId = (newNumberOfViewDepth-1)>>1;   // coding order T0D0T1D1T2D2
    462462  Bool isDepth = ((newNumberOfViewDepth % 2) == 0);  // coding order T0D0T1D1T2D2
    … …  
    471471      m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
    472472      Char buffer[4];
    473 #if VIDYO_VPS_INTEGRATION|MVHEVC
     473#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    474474      sprintf(buffer,"_%i", viewId );
    475475#else
    … …  
    477477#endif
    478478      Char* nextFilename = NULL;
    479 #if VIDYO_VPS_INTEGRATION|MVHEVC
     479#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    480480      if( isDepth)
    481481#else
    … …  
    492492        xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
    493493      }
    494 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     494#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    495495      if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
    496496#endif
    … …  
    509509  {
    510510    m_tDecTop.push_back(new TDecTop);
    511 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     511#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    512512    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
    513513    {
    … …  
    519519      m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
    520520      m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
    521 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     521#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    522522    }
    523523#endif

  • branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.h

    r194 r195  
    7474  CamParsCollector                m_cCamParsCollector;
    7575#if DEPTH_MAP_GENERATION
    76 #if VIDYO_VPS_INTEGRATION|MVHEVC
     76#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    7777  TComVPSAccess                   m_cVPSAccess;
    7878#endif
    … …  
    8888  Void  destroy           (); ///< destroy internal members
    8989  Void  decode            (); ///< main decoding function
    90 #if VIDYO_VPS_INTEGRATION|MVHEVC
     90#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9191  Void  increaseNumberOfViews  (UInt layerId, UInt viewId, UInt isDepth);
    9292#else

  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

    r194 r195  
    329329  /* Camera Paremetes */
    330330  ("CameraParameterFile,cpf", m_pchCameraParameterFile,    (Char *) 0, "Camera Parameter File Name")
    331 #if MVHEVC
     331#if QC_MVHEVC_B0046
    332332  ("BaseViewCameraNumbers" ,  m_aiVId,     std::vector<Int>(1, MAX_VIEW_NUM), "Numbers of base views")
    333333#endif
    … …  
    789789}
    790790#else
    791 #if !MVHEVC
     791#if !QC_MVHEVC_B0046
    792792  m_cCameraData     .init     ( (UInt)m_iNumberOfViews,
    793793    m_uiInputBitDepth,
    … …  
    806806  // check validity of input parameters
    807807  xCheckParameter();
    808 #if !MVHEVC
     808#if !QC_MVHEVC_B0046
    809809  m_cCameraData.check( false, true );
    810810#endif

  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h

    r194 r195  
    109109  std::vector<Double>  m_adQP;                                ///< QP value of key-picture (floating point) [0] video, [1] depth
    110110  std::vector<Int>     m_aiQP;                                ///< QP value of key-picture (integer) [0] video, [1] depth
    111 #if MVHEVC
     111#if QC_MVHEVC_B0046
    112112  std::vector<Int>     m_aiVId;                                ///< view id
    113113#endif
    … …  
    288288  Char*     m_pchCameraParameterFile;                         ///< camera parameter file
    289289  Char*     m_pchBaseViewCameraNumbers;
    290 #if !MVHEVC
     290#if !QC_MVHEVC_B0046
    291291  TAppComCamPara m_cCameraData;
    292292#endif

  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp

    r194 r195  
    6767Void TAppEncTop::xInitLibCfg()
    6868{
    69 #if VIDYO_VPS_INTEGRATION|MVHEVC
    70 #if !MVHEVC
     69#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     70#if !QC_MVHEVC_B0046
    7171  UInt layerId = 0;
    7272#endif
    7373  // TODO: fix the assumption here that the temporal structures are all equal across all layers???
    7474  m_cVPS.setMaxTLayers( m_maxTempLayer[0] );
    75 #if MVHEVC
     75#if QC_MVHEVC_B0046
    7676  m_cVPS.setMaxLayers( m_iNumberOfViews );
    7777#else
    … …  
    107107    m_acTEncTopList[iViewIdx]->setViewId                       ( iViewIdx );
    108108    m_acTEncTopList[iViewIdx]->setIsDepth                      ( false );
    109 #if MVHEVC
     109#if QC_MVHEVC_B0046
    110110    m_acTEncTopList[iViewIdx]->setLayerId                      ( iViewIdx );
    111111    m_cVPS.setViewId                                           ( m_aiVId[ iViewIdx ], iViewIdx );
    … …  
    417417      m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
    418418      m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
    419 #if MVHEVC
     419#if QC_MVHEVC_B0046
    420420      m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( iViewIdx );
    421421#else
    … …  
    836836  {
    837837    m_acTEncTopList[iViewIdx]->init( this );
    838 #if MVHEVC
     838#if QC_MVHEVC_B0046
    839839  //set setNumDirectRefLayer
    840840  Int iNumDirectRef = m_acTEncTopList[iViewIdx]->getSPS()->getNumberOfUsableInterViewRefs();
    … …  
    887887  TComPicYuv*       pcPicYuvOrg = new TComPicYuv;
    888888  TComPicYuv*       pcDepthPicYuvOrg = new TComPicYuv;
    889 #if !MVHEVC
     889#if !QC_MVHEVC_B0046
    890890  TComPicYuv*       pcPdmDepthOrg    = new TComPicYuv;
    891891#endif
    … …  
    990990    {
    991991      Int  iNumEncoded = 0;
    992 #if !MVHEVC
     992#if !QC_MVHEVC_B0046
    993993      UInt iNextPoc = m_acTEncTopList[0] -> getFrameId( gopId );
    994994      if ( iNextPoc < m_iFrameToBeEncoded )
    … …  
    10521052  pcDepthPicYuvOrg = NULL;
    10531053
    1054 #if !MVHEVC
    1055 #if BUG_FIX_HTM
     1054#if !QC_MVHEVC_B0046
     1055#if FIX_DEL_NULLPTR
    10561056  if ( pcPdmDepthOrg != NULL && m_uiMultiviewMvRegMode )
    10571057#else
    … …  
    12671267    case NAL_UNIT_CODED_SLICE:
    12681268#if H0566_TLA
    1269 #if !QC_REM_IDV
     1269#if !QC_REM_IDV_B0046
    12701270    case NAL_UNIT_CODED_SLICE_IDV:
    12711271#endif

  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.h

    r194 r195  
    8787#endif
    8888
    89 #if VIDYO_VPS_INTEGRATION|MVHEVC
     89#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9090  TComVPS                     m_cVPS;
    9191#endif
    … …  
    139139#endif
    140140 
    141 #if MVHEVC
     141#if QC_MVHEVC_B0046
    142142  TComVPS*          getVPS()  { return &m_cVPS; }
    143143#endif

  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/RendererMain.cpp

    r194 r195  
    4343int main(int argc, char* argv[])
    4444  {
    45 #if !MVHEVC
     45#if !QC_MVHEVC_B0046
    4646  TAppRendererTop  cTAppRendererTop;
    4747

  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.cpp

    r194 r195  
    5959// Constructor / destructor / initialization / destroy
    6060// ====================================================================================================================
    61 #if !MVHEVC
     61#if !QC_MVHEVC_B0046
    6262TAppRendererCfg::TAppRendererCfg()
    6363{

  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.h

    r194 r195  
    5050#include <string>
    5151#include <vector>
    52 #if !MVHEVC
     52#if !QC_MVHEVC_B0046
    5353// ====================================================================================================================
    5454// Class definition

  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.cpp

    r194 r195  
    4545// Constructor / destructor / initialization / destroy
    4646// ====================================================================================================================
    47 #if !MVHEVC
     47#if !QC_MVHEVC_B0046
    4848TAppRendererTop::TAppRendererTop()
    4949{

  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.h

    r194 r195  
    5050#include "../../Lib/TLibRenderer/TRenModel.h"
    5151
    52 #if !MVHEVC
     52#if !QC_MVHEVC_B0046
    5353// ====================================================================================================================
    5454// Class definition
Note: See TracChangeset for help on using the changeset viewer.