Changeset 1108 in SHVCSoftware for branches/SHM-dev/source/Lib


Ignore:
Timestamp:
6 Jul 2015, 21:03:54 (9 years ago)
Author:
seregin
Message:

macro cleanup: CROSS_LAYER_BLA_FLAG_FIX

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

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1107 r1108  
    4949#define SIGNALLING_BITRATE_PICRATE_FIX   1      ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R1008
    5050#define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
    51 #define CROSS_LAYER_BLA_FLAG_FIX         1      ///< Fix for earlier implementation mistake that omit the signalling of cross_layer_bla_flag
    5251#define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
    5352#define VPS_AVC_BL_FLAG_REMOVAL          1      ///< remove avc_base_layer_flag and direct the function its offer to vps_base_layer_internal_flag and vps_base_layer_available_flag
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1107 r1108  
    12321232  {
    12331233#if SVC_EXTENSION
    1234 #if CROSS_LAYER_BLA_FLAG_FIX
    12351234    Int iBits = 0;
    12361235    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
    1237 #else
    1238     if(pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
    1239 #endif
    12401236    {
    12411237      READ_FLAG(uiCode, "discardable_flag"); // ignored
     
    12511247      }
    12521248#endif
    1253 #if CROSS_LAYER_BLA_FLAG_FIX
    12541249      iBits++;
    1255 #endif
    1256     }
    1257 #if CROSS_LAYER_BLA_FLAG_FIX
     1250    }
     1251
    12581252    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
    12591253    {
     
    12611255      iBits++;
    12621256    }
     1257
    12631258    for ( ; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
    1264 #else
    1265     for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
    1266 #endif
    12671259    {
    12681260      READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1105 r1108  
    955955  {
    956956#if SVC_EXTENSION
    957 #if CROSS_LAYER_BLA_FLAG_FIX
    958957    Int iBits = 0;
    959958    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
    960 #else
    961     if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)
    962 #endif
    963959    {
    964960      assert(!!"discardable_flag");
     
    974970#endif
    975971      WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag");
    976 #if CROSS_LAYER_BLA_FLAG_FIX
    977972      iBits++;
    978 #endif
    979     }
    980 #if CROSS_LAYER_BLA_FLAG_FIX
     973    }
     974
    981975    if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits )
    982976    {
     
    985979      iBits++;
    986980    }
     981
    987982    for (; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
    988 #else
    989     for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
    990 #endif
    991983    {
    992984      assert(!!"slice_reserved_undetermined_flag[]");
Note: See TracChangeset for help on using the changeset viewer.