Changeset 1117 in SHVCSoftware for branches


Ignore:
Timestamp:
7 Jul 2015, 01:35:39 (9 years ago)
Author:
seregin
Message:

macro cleanup: R0156_CONF_WINDOW_IN_REP_FORMAT

Location:
branches/SHM-dev/source
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1116 r1117  
    188188#endif
    189189
    190 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    191190    repFormat->getConformanceWindowVps().setWindow                        ( m_acLayerCfg[mapIdxToLayer[idx]].m_confWinLeft,                                                                             
    192191                                                                            m_acLayerCfg[mapIdxToLayer[idx]].m_confWinRight,
    193192                                                                            m_acLayerCfg[mapIdxToLayer[idx]].m_confWinTop,
    194193                                                                            m_acLayerCfg[mapIdxToLayer[idx]].m_confWinBottom );
    195 #endif
    196194
    197195#if HIGHER_LAYER_IRAP_SKIP_FLAG

  • branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp

    r1029 r1117  
    8282  if (!bIsVirtual)
    8383  {
    84 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    8584    m_apcPicYuv[PIC_YUV_ORG]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_ORG]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, &conformanceWindow );
    86 #else
    87     m_apcPicYuv[PIC_YUV_ORG]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_ORG]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    88 #endif
    89 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    9085    m_apcPicYuv[PIC_YUV_TRUE_ORG]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_TRUE_ORG]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, &conformanceWindow );
    91 #else
    92     m_apcPicYuv[PIC_YUV_TRUE_ORG]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_TRUE_ORG]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    93 #endif
    94   }
    95 #if R0156_CONF_WINDOW_IN_REP_FORMAT
     86  }
    9687  m_apcPicYuv[PIC_YUV_REC]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_REC]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, &conformanceWindow );
    97 #else
    98   m_apcPicYuv[PIC_YUV_REC]  = new TComPicYuv;  m_apcPicYuv[PIC_YUV_REC]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    99 #endif
    10088
    10189  for( Int i = 0; i < MAX_LAYERS; i++ )
    … …  
    10391    if( m_bSpatialEnhLayer[i] )
    10492    {
    105 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    10693      m_pcFullPelBaseRec[i] = new TComPicYuv;  m_pcFullPelBaseRec[i]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, &conformanceWindow );
    107 #else
    108       m_pcFullPelBaseRec[i] = new TComPicYuv;  m_pcFullPelBaseRec[i]->create( iWidth, iHeight, chromaFormatIDC, uiMaxWidth, uiMaxHeight, uiMaxDepth, pcSps );
    109 #endif
    11094    }
    11195  }

  • branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

    r1091 r1117  
    7777
    7878#if SVC_EXTENSION
    79 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    8079Void TComPicYuv::create( const Int iPicWidth, const Int iPicHeight, const ChromaFormat chromaFormatIDC, const UInt uiMaxCUWidth, const UInt uiMaxCUHeight, const UInt uiMaxCUDepth, Window* conformanceWindow )
    81 #else
    82 Void TComPicYuv::create( const Int iPicWidth, const Int iPicHeight, const ChromaFormat chromaFormatIDC, const UInt uiMaxCUWidth, const UInt uiMaxCUHeight, const UInt uiMaxCUDepth, TComSPS* pcSps )
    83 #endif
    8480#else
    8581Void TComPicYuv::create( const Int  iPicWidth,    const  Int iPicHeight,    const ChromaFormat chromaFormatIDC,
    … …  
    9288 
    9389#if SVC_EXTENSION
    94 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    9590  if(conformanceWindow != NULL)
    9691  {
    9792    m_conformanceWindow = *conformanceWindow;
    9893  }
    99 #else
    100   if(pcSps != NULL)
    101   {
    102     m_conformanceWindow = pcSps->getConformanceWindow();
    103   }
    104 #endif
    10594#endif
    10695 

  • branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.h

    r1029 r1117  
    9898  // ------------------------------------------------------------------------------------------------
    9999#if SVC_EXTENSION
    100 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    101100  Void  create      ( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, Window* conformanceWindow = NULL);
    102 #else
    103   Void  create      ( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps = NULL);
    104 #endif
    105101#else
    106102  Void          create            (const Int iPicWidth,

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1116 r1117  
    39103910}
    39113911
    3912 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    39133912Window& TComSlice::getConformanceWindow()
    39143913{
    … …  
    39493948#endif
    39503949}
    3951 #endif
    39523950
    39533951RepFormat::RepFormat()
    … …  
    39633961, m_bitDepthVpsChroma           (0)
    39643962{}
    3965 #endif
     3963#endif //REPN_FORMAT_IN_VPS
    39663964
    39673965#if VPS_EXTN_PROFILE_INFO

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1116 r1117  
    525525  Int  m_bitDepthVpsChroma;             // coded as minus8
    526526
    527 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    528527  Window m_conformanceWindowVps;
    529 #endif
    530528
    531529public:
    … …  
    561559  Int  getBitDepthVps(ChannelType type)           { return isLuma(type) ? m_bitDepthVpsLuma : m_bitDepthVpsChroma;   }
    562560
    563 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    564561  Window& getConformanceWindowVps()                           { return  m_conformanceWindowVps;             }
    565562  Void    setConformanceWindowVps(Window& conformanceWindow ) { m_conformanceWindowVps = conformanceWindow; }
    566 #endif
    567563};
    568 #endif
     564#endif //REPN_FORMAT_IN_VPS
    569565
    570566class TComVPS
    … …  
    26252621  Int  getQpBDOffsetC();
    26262622
    2627 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    26282623  Window& getConformanceWindow();
    2629 #endif
    26302624#endif
    26312625

  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1116 r1117  
    195195#define Q0195_REP_FORMAT_CLEANUP         1      ///< JCTVC-Q0195: restructureing of rep_format() signaling
    196196
    197 #define R0156_CONF_WINDOW_IN_REP_FORMAT  O0096_REP_FORMAT_INDEX ///< JCTVC-R0156: add conformance window cropping offsets to rep_format()
    198 
    199197#define RESAMPLING_CONSTRAINT_BUG_FIX    1
    200198#define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1116 r1117  
    36293629#endif
    36303630
    3631 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    36323631  READ_FLAG( uiCode, "conformance_window_vps_flag" );
    36333632  if( uiCode != 0)
    … …  
    36393638    READ_UVLC( uiCode, "conf_win_vps_bottom_offset" );       conf.setWindowBottomOffset( uiCode );
    36403639  }
    3641 #endif
    3642 }
    3643 #endif
     3640}
     3641#endif //REPN_FORMAT_IN_VPS
    36443642#if VPS_DPB_SIZE_TABLE
    36453643Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1116 r1117  
    240240{
    241241  Int  numReorderPics[MAX_TLAYER];
    242 #if R0156_CONF_WINDOW_IN_REP_FORMAT
     242#if SVC_EXTENSION
    243243  Window &conformanceWindow = pcSlice->getConformanceWindow();
    244244#else
    … …  
    562562
    563563      Int  numReorderPics[MAX_TLAYER];
    564 #if !R0156_CONF_WINDOW_IN_REP_FORMAT
    565       Window conformanceWindow;
    566 #endif
    567564      Window defaultDisplayWindow;
    568565
    569 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    570566#if AUXILIARY_PICTURES
    571567      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), repFormat->getConformanceWindowVps(), defaultDisplayWindow, numReorderPics, NULL, true);
    572568#else
    573569      pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), repFormat->getConformanceWindowVps(), defaultDisplayWindow, numReorderPics, NULL, true);
    574 #endif
    575 #else
    576 #if AUXILIARY_PICTURES
    577       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
    578 #else
    579       pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true);
    580 #endif
    581570#endif
    582571      // it is needed where the VPS is accessed through the slice
    … …  
    24892478
    24902479    Int  numReorderPics[MAX_TLAYER];
    2491 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    24922480    Window &conformanceWindow = slice->getConformanceWindow();
    2493 #else
    2494     Window &conformanceWindow = pcSPS->getConformanceWindow();
    2495 #endif
    24962481    Window defaultDisplayWindow = pcSPS->getVuiParametersPresentFlag() ? pcSPS->getVuiParameters()->getDefaultDisplayWindow() : Window();
    24972482

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1116 r1117  
    24882488#endif
    24892489
    2490 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    24912490  Window conf = repFormat->getConformanceWindowVps();
    24922491
    … …  
    24992498    WRITE_UVLC( conf.getWindowBottomOffset(), "conf_win_vps_bottom_offset" );
    25002499  }
    2501 #endif
    25022500}
    25032501#endif

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r1093 r1117  
    15301530
    15311531    Int  numReorderPics[MAX_TLAYER];
    1532 #if R0156_CONF_WINDOW_IN_REP_FORMAT
    15331532    Window &conformanceWindow = repFormat->getConformanceWindowVps();
    1534 #else
    1535     Window &conformanceWindow = m_cSPS.getConformanceWindow();
    1536 #endif
    15371533    Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window();
    15381534
Note: See TracChangeset for help on using the changeset viewer.