Changeset 1126 in SHVCSoftware


Ignore:
Timestamp:
7 Jul 2015, 02:30:56 (9 years ago)
Author:
seregin
Message:

macro cleanup: O0223_PICTURE_TYPES_ALIGN_FLAG

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

Legend:

Unmodified
Added
Removed

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

    r1124 r1126  
    11671167  ("MaxTidRefPresentFlag",                           m_maxTidRefPresentFlag,                            false, "max_tid_ref_present_flag (0: not present, 1: present) " )
    11681168  ("MaxTidIlRefPicsPlus1%d",                         cfg_maxTidIlRefPicsPlus1,                  7, MAX_LAYERS, "allowed maximum temporal_id for inter-layer prediction")
    1169 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    11701169  ("CrossLayerPictureTypeAlignFlag",                 m_crossLayerPictureTypeAlignFlag,                   true, "align picture type across layers" ) 
    1171 #endif
    11721170  ("CrossLayerIrapAlignFlag",                        m_crossLayerIrapAlignFlag,                          true, "align IRAP across layers" ) 
    11731171#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    … …  
    45094507  printf("Skip picture at ARC switch        : %d\n", m_skipPictureAtArcSwitch );
    45104508#endif
    4511 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    45124509  printf("Align picture type                : %d\n", m_crossLayerPictureTypeAlignFlag );
    4513 #endif
    45144510  printf("Cross layer IRAP alignment        : %d\n", m_crossLayerIrapAlignFlag );
    45154511#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

    r1124 r1126  
    490490  UInt      m_ilcIdc[1024];
    491491#endif
    492 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    493492  Bool      m_crossLayerPictureTypeAlignFlag;
    494 #endif
    495493  Bool      m_crossLayerIrapAlignFlag;
    496494#if Q0096_OVERLAY_SEI

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

    r1124 r1126  
    17541754    }
    17551755#endif
    1756 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    17571756    vps->setCrossLayerPictureTypeAlignFlag( m_crossLayerPictureTypeAlignFlag );
    1758 #endif
    17591757#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    17601758    vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );

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

    r1122 r1126  
    20502050  ::memset(m_pocLsbNotPresentFlag, 0, sizeof(m_pocLsbNotPresentFlag));
    20512051#endif
    2052 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    20532052  m_crossLayerPictureTypeAlignFlag = true;
    2054 #endif
    20552053  m_crossLayerIrapAlignFlag = true;
    20562054#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG

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

    r1124 r1126  
    697697  Bool       m_pocLsbNotPresentFlag[MAX_VPS_LAYER_IDX_PLUS1];
    698698#endif
    699 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    700699  Bool       m_crossLayerPictureTypeAlignFlag;
    701 #endif
    702700  Bool       m_crossLayerIrapAlignFlag;
    703701#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    … …  
    849847#endif
    850848#endif //SVC_EXTENSION
     849
    851850public:
    852851  TComVPS();
    … …  
    11171116  Void   setVpsPocLsbAlignedFlag(Bool x)                                        { m_vpsPocLsbAlignedFlag = x; }
    11181117#endif
    1119 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    11201118  Bool   getCrossLayerPictureTypeAlignFlag()                                    { return m_crossLayerPictureTypeAlignFlag;                      }
    11211119  Void   setCrossLayerPictureTypeAlignFlag(Bool x)                              { m_crossLayerPictureTypeAlignFlag = x;                         }
    1122 #endif
    11231120#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    11241121  Bool   getCrossLayerAlignedIdrOnlyFlag()                                    { return m_crossLayerAlignedIdrOnlyFlag;                      }

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

    r1125 r1126  
    169169#define Q0060_MAX_TID_REF_EQUAL_TO_ZERO  1      ///< JCTVC-Q0060 handling the case max_tid_il_ref_pics_plus1 is equal to 0.
    170170
    171 #define O0223_PICTURE_TYPES_ALIGN_FLAG   1      ///< a flag to indicatate whether picture types are aligned across layers.
    172 
    173171#define P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG   1  ///< a flag to indicatate whether picture types for IRAP are IDR across layers.
    174172

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

    r1125 r1126  
    36603660  UInt i,j;
    36613661  UInt uiCode;
    3662 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    36633662  READ_FLAG(uiCode, "cross_layer_pic_type_aligned_flag" );
    36643663  vps->setCrossLayerPictureTypeAlignFlag(uiCode);
    36653664  if (!uiCode)
    36663665  {
    3667 #endif
    36683666    READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
    36693667    vps->setCrossLayerIrapAlignFlag(uiCode);
    3670 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    36713668  }
    36723669  else
    … …  
    36743671    vps->setCrossLayerIrapAlignFlag(true);
    36753672  }
    3676 #endif
     3673
    36773674#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    36783675  if( uiCode )

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

    r1125 r1126  
    25112511{
    25122512  Int i,j;
    2513 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    25142513  WRITE_FLAG(vps->getCrossLayerPictureTypeAlignFlag(), "cross_layer_pic_type_aligned_flag");
    25152514  if (!vps->getCrossLayerPictureTypeAlignFlag())
    25162515  {
    2517 #endif
    25182516    WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
    2519 #if O0223_PICTURE_TYPES_ALIGN_FLAG
    25202517  }
    25212518  else
    … …  
    25232520    vps->setCrossLayerIrapAlignFlag(vps->getVpsVuiPresentFlag()); // When not present, the value of cross_layer_irap_aligned_flag is inferred to be equal to vps_vui_present_flag
    25242521  }
    2525 #endif
     2522
    25262523#if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG
    25272524  if(vps->getCrossLayerIrapAlignFlag())
Note: See TracChangeset for help on using the changeset viewer.