Changeset 1164 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 01:06:51 (9 years ago)
Author:
seregin
Message:

macro cleanup: P0307_VPS_NON_VUI_EXTENSION

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1161 r1164  
    19751975#endif
    19761976#endif
    1977 #if P0307_VPS_NON_VUI_EXTENSION
    19781977, m_vpsNonVuiExtLength (0)
    1979 #endif
    19801978#if P0297_VPS_POC_LSB_ALIGNED_FLAG
    19811979, m_vpsPocLsbAlignedFlag(false)

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

    r1163 r1164  
    790790#endif
    791791  UInt       m_baseLayerPSCompatibilityFlag[MAX_LAYERS];
    792 #if P0307_VPS_NON_VUI_EXTENSION
    793792  Int        m_vpsNonVuiExtLength;
    794 #endif
    795793#if P0297_VPS_POC_LSB_ALIGNED_FLAG
    796794  Bool       m_vpsPocLsbAlignedFlag;
    … …  
    12351233  Bool   getVpsExtensionFlag()                         { return m_vpsExtensionFlag;  }
    12361234  Void   setVpsExtensionFlag(Bool x)                   { m_vpsExtensionFlag = x;     }
    1237 
    1238 #if P0307_VPS_NON_VUI_EXTENSION
    1239   Int    getVpsNonVuiExtLength()         { return m_vpsNonVuiExtLength; }
    1240   Void   setVpsNonVuiExtLength(Int x)    { m_vpsNonVuiExtLength = x; }
    1241 #endif
     1235  Int    getVpsNonVuiExtLength()                       { return m_vpsNonVuiExtLength; }
     1236  Void   setVpsNonVuiExtLength(Int x)                  { m_vpsNonVuiExtLength = x; }
    12421237#if O0164_MULTI_LAYER_HRD
    12431238  Void   setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess );

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

    r1163 r1164  
    7272
    7373#define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
    74 #define P0307_VPS_NON_VUI_EXTENSION      1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
    7574#define P0307_VPS_NON_VUI_EXT_UPDATE     1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
    7675

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

    r1163 r1164  
    31463146#endif
    31473147
    3148 #if P0307_VPS_NON_VUI_EXTENSION
    31493148  READ_UVLC( uiCode,           "vps_non_vui_extension_length"); vps->setVpsNonVuiExtLength((Int)uiCode);
    31503149
    … …  
    31633162    printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
    31643163  }
    3165 #endif
    31663164#endif
    31673165

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

    r1163 r1164  
    22852285  }
    22862286
    2287 #if P0307_VPS_NON_VUI_EXTENSION
    22882287  // The value of vps_non_vui_extension_length shall be in the range of 0 to 4096, inclusive.
    22892288  assert( vps->getVpsNonVuiExtLength() >= 0 && vps->getVpsNonVuiExtLength() <= 4096 );
    … …  
    23002299    printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
    23012300  }
    2302 #endif
    23032301#endif
    23042302
Note: See TracChangeset for help on using the changeset viewer.