Changeset 973 in 3DVCSoftware


Ignore:
Timestamp:
6 Jul 2014, 04:44:14 (10 years ago)
Author:
tech
Message:

Cleanup part 7.

Location:
branches/HTM-11.1-dev0/source
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-11.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

    r964 r973  
    7171#endif
    7272
    73 #if H_MV_HLS_7_VPS_P0300_27
     73#if H_MV
    7474    m_markedForOutput = false;
    7575#endif
    … …  
    161161  Int  pocLastPic        = -MAX_INT;   
    162162
    163 #if H_MV_HLS_7_VPS_P0300_27
    164163  Int  layerIdLastPic    = -MAX_INT;
    165 #endif
    166164  Int  layerIdCurrPic    = 0;
    167165
    … …  
    216214          || (nalu.m_nalUnitType == NAL_UNIT_VPS && nalu.m_layerId > 0)           
    217215          || (nalu.m_nalUnitType == NAL_UNIT_EOB && nalu.m_layerId > 0)   
    218 #if H_MV_HLS_8_MIS_Q0177_47
    219216          || (nalu.m_nalUnitType == NAL_UNIT_EOS && nalu.m_layerId > 0)   
    220 #endif
    221217         )
    222218      {
    … …  
    237233        // - nalu.isSlice() == true     
    238234
    239 #if H_MV_HLS_7_VPS_P0300_27
    240235        if ( nalu.m_nalUnitType == NAL_UNIT_VPS )
    241236        {
    … …  
    244239          {
    245240            TComVPS* vps = m_vps;
    246 #else
    247         // Update TargetDecLayerIdList only when not specified by layer id file, specification by file might actually out of conformance.
    248         if (nalu.m_nalUnitType == NAL_UNIT_VPS && m_targetDecLayerIdSetFileEmpty )
    249         {
    250           TComVPS* vps = m_tDecTop[decIdx]->getPrefetchedVPS();
    251 #endif
    252241          if ( m_targetOptLayerSetIdx == -1 )
    253242          {
    … …  
    255244            m_targetOptLayerSetIdx = vps->getVpsNumLayerSetsMinus1();
    256245          }
    257 #if H_MV_HLS_8_HRD_Q0102_08
     246
    258247          for (Int dI = 0; dI < m_numDecoders; dI++ )
    259248          {
    260249            m_tDecTop[decIdx]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx );
    261250          }
    262 #endif
    263251
    264252          if ( m_targetOptLayerSetIdx < 0 || m_targetOptLayerSetIdx >= vps->getNumOutputLayerSets() )
    … …  
    269257          m_targetDecLayerIdSet = vps->getTargetDecLayerIdList( m_targetOptLayerSetIdx );
    270258        }
    271 #if H_MV_HLS_7_VPS_P0300_27
    272       }
    273 #endif
     259      }
    274260#if H_3D
    275261        if (nalu.m_nalUnitType == NAL_UNIT_VPS )
    … …  
    289275        if ( bNewPicture || !bitstreamFile )
    290276        {
    291 #if H_MV_HLS_7_VPS_P0300_27
    292277          layerIdLastPic    = layerIdCurrPic;
    293 #endif
    294278          layerIdCurrPic    = nalu.m_layerId;
    295279          pocLastPic        = pocCurrPic;
    … …  
    340324        assert( decIdxLastPic != -1 );
    341325        m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
    342 #if H_MV_HLS_7_VPS_P0300_27
    343326        xMarkForOutput( allLayersDecoded, poc, layerIdLastPic );
    344 #endif
    345327#else
    346328        m_cTDecTop.executeLoopFilters(poc, pcListPic);
    … …  
    799781        }
    800782        pcPic->setOutputMark(false);
    801 #if H_MV_HLS_7_VPS_P0300_27
     783#if H_MV
    802784        pcPic->setPicOutputFlag(false);
    803785#endif
    … …  
    985967        }
    986968        pcPic->setOutputMark(false);
    987 #if H_MV_HLS_7_VPS_P0300_27
     969#if H_MV
    988970        pcPic->setPicOutputFlag(false);
    989971#endif
    … …  
    10611043    m_tDecTop[ decIdx ]->setIvPicLists( &m_ivPicLists );
    10621044    m_tDecTop[ decIdx ]->setLayerInitilizedFlags( m_layerInitilizedFlags );
    1063 #if    H_MV_HLS_8_HRD_Q0102_08
    10641045    m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx );   
    1065 #endif
    10661046
    10671047#if H_3D
    … …  
    10991079}
    11001080
    1101 
    1102 #if H_MV_HLS_7_VPS_P0300_27
    11031081Void TAppDecTop::xMarkForOutput( Bool allLayersDecoded, Int pocLastPic, Int layerIdLastPic )
    11041082{ 
    … …  
    11521130  }
    11531131}
    1154 #endif
     1132
     1133Void TAppDecTop::xMarkAltOutPic( Int targetOutputLayer, Int pocLastPic )
     1134{
     1135  Int optLayerIdxInVps = m_vps->getLayerIdInNuh( targetOutputLayer );
     1136  Int highestNuhLayerId = -1;
     1137  TComPic* picWithHighestNuhLayerId = NULL;
     1138  for (Int dIdx = 0; dIdx < m_numDecoders; dIdx++)
     1139  {
     1140    Int curLayerId = m_tDecTop[dIdx]->getLayerId();
     1141    Int curLayerIdxInVps = m_vps->getLayerIdInNuh( curLayerId  );
     1142    if ( m_vps->getInDirectDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
     1143    {
     1144      TComPic* curPic = m_ivPicLists.getPic( curLayerId, pocLastPic );
     1145      if (curPic != NULL)
     1146      {
     1147        if (curPic->getReconMark() && curPic->getPicOutputFlag() )
     1148        {
     1149          curPic->setOutputMark   ( false );
     1150          curPic->setPicOutputFlag( false );
     1151          if ( curLayerId > highestNuhLayerId)
     1152          {
     1153            highestNuhLayerId = curLayerId ;
     1154            picWithHighestNuhLayerId = curPic;
     1155          }           
     1156        }
     1157      }
     1158    }
     1159  }
     1160  if ( picWithHighestNuhLayerId != NULL )
     1161  {
     1162    picWithHighestNuhLayerId->setPicOutputFlag(true);
     1163    picWithHighestNuhLayerId->setOutputMark   (true);
     1164  }
     1165}
     1166
    11551167#endif
    11561168//! \}

  • branches/HTM-11.1-dev0/source/App/TAppDecoder/TAppDecTop.h

    r964 r973  
    6868  TComPicLists                    m_ivPicLists;                                ///< picture buffers of decoder instances
    6969  Bool                            m_layerInitilizedFlags[ MAX_NUM_LAYER_IDS ]; ///< for layerwise startup
    70 #if H_MV_HLS_7_VPS_P0300_27
    7170  TComVPS*                        m_vps;                                ///< active VPS
    72 #endif
    7371#else
    7472  TDecTop                         m_cTDecTop;                     ///< decoder class
    … …  
    7977  Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
    8078  Bool                            m_reconOpen           [ MAX_NUM_LAYERS ]; ///< reconstruction file opened
     79  Bool                            m_markedForOutput;
    8180#else
    8281  Int                             m_iPOCLastDisplay;              ///< last POC in display order
    8382#endif
    84 #if H_MV_HLS_7_VPS_P0300_27
    85   Bool                            m_markedForOutput;
    86 #endif
    87 
    8883
    8984#if H_3D
    … …  
    107102  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
    108103
    109 #if H_MV_HLS_7_VPS_P0300_27
    110104  Void  xMarkForOutput   ( Bool allLayersDecoded, Int pocLastPic, Int layerIdLastPic );         
    111   Void  xMarkAltOutPic    ( Int targetOutputLayer, Int pocLastPic )
    112   {
    113     Int optLayerIdxInVps = m_vps->getLayerIdInNuh( targetOutputLayer );
    114     Int highestNuhLayerId = -1;
    115     TComPic* picWithHighestNuhLayerId = NULL;
    116     for (Int dIdx = 0; dIdx < m_numDecoders; dIdx++)
    117     {
    118       Int curLayerId = m_tDecTop[dIdx]->getLayerId();
    119       Int curLayerIdxInVps = m_vps->getLayerIdInNuh( curLayerId  );
    120       if ( m_vps->getInDirectDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
    121       {
    122         TComPic* curPic = m_ivPicLists.getPic( curLayerId, pocLastPic );
    123         if (curPic != NULL)
    124         {
    125           if (curPic->getReconMark() && curPic->getPicOutputFlag() )
    126           {
    127             curPic->setOutputMark   ( false );
    128             curPic->setPicOutputFlag( false );
    129             if ( curLayerId > highestNuhLayerId)
    130             {
    131               highestNuhLayerId = curLayerId ;
    132               picWithHighestNuhLayerId = curPic;
    133             }           
    134           }
    135         }
    136       }
    137     }
    138     if ( picWithHighestNuhLayerId != NULL )
    139     {
    140       picWithHighestNuhLayerId->setPicOutputFlag(true);
    141       picWithHighestNuhLayerId->setOutputMark   (true);
    142     }
    143   }
    144 #endif
     105  Void  xMarkAltOutPic    ( Int targetOutputLayer, Int pocLastPic );
    145106
    146107  Void  xFlushOutput      ( TComList<TComPic*>* pcListPic, Int layerId ); ///< flush all remaining decoded pictures to file

  • branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r969 r973  
    393393  ("LayerIdsInAddOutputLayerSet_%d", m_layerIdsInAddOutputLayerSet      , std::vector<Int>(0,0), MAX_VPS_ADD_OUTPUT_LAYER_SETS, "Indices in VPS of output layers in additional output layer set") 
    394394  ("LayerIdsInDefOutputLayerSet_%d", m_layerIdsInDefOutputLayerSet      , std::vector<Int>(0,0), MAX_VPS_OP_SETS_PLUS1, "Indices in VPS of output layers in layer set") 
    395 #if H_MV_HLS_7_VPS_P0300_27
    396395  ("AltOutputLayerFlag",    m_altOutputLayerFlag , std::vector<Bool>(1,0), "Alt output layer flag")
    397 #endif
    398396  ("ProfileLevelTierIdx",   m_profileLevelTierIdx, std::vector<Int>(1,0), "Indices to profile level tier")
    399397 
    … …  
    10561054  xResizeVector( m_wppInUseFlag );
    10571055
    1058 #if H_MV_HLS_7_VPS_P0300_27
    10591056  for (Int olsIdx = 0; olsIdx < m_vpsNumLayerSets + (Int) m_outputLayerSetIdx.size(); olsIdx++)
    10601057  {   
    10611058    m_altOutputLayerFlag.push_back( false );     
    10621059  }
    1063 #endif
    10641060#else
    10651061  m_aidQP = new Int[ m_framesToBeEncoded + m_iGOPSize + 1 ];
    … …  
    14631459  }
    14641460
    1465 #if H_MV_HLS_7_VPS_P0300_27
    14661461  xConfirmPara( m_altOutputLayerFlag.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" );
    1467 #endif
    14681462  xConfirmPara( m_profileLevelTierIdx.size() < m_vpsNumLayerSets + m_outputLayerSetIdx.size(), "The number of Profile Level Tier indices must be equal to the number of layer set plus the number of output layer set indices" );
    14691463

  • branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r969 r973  
    9494  std::vector< std::vector<Int> > m_layerIdsInDefOutputLayerSet; ///< Indices in vps of output layers in layer sets
    9595  std::vector<Int>       m_profileLevelTierIdx;               ///< Indices of of profile level tier
    96   #if H_MV_HLS_7_VPS_P0300_27
    9796  std::vector<Bool>      m_altOutputLayerFlag;                ///< Alt output layer flag
    98 #endif
    9997
    10098  // Dependencies

  • branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r971 r973  
    12801280
    12811281  Int  defaultDirectDependencyType = -1;
    1282 #if MV_FIX_DEP_TYPES
    12831282  Bool defaultDirectDependencyFlag = false;
    1284 #else
    1285   Bool defaultDirectDependencyFlag = true;
    1286 #endif
    12871283
    12881284  for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ )
    … …  
    13031299      {
    13041300        defaultDirectDependencyType = curDirectDependencyType;
    1305 #if MV_FIX_DEP_TYPES
    13061301        defaultDirectDependencyFlag = true;
    1307 #endif
    13081302      }
    13091303     
    … …  
    16441638      vps.setProfileLevelTierIdx( olsIdx, m_profileLevelTierIdx[ olsIdx ] );
    16451639    }
    1646 #if H_MV_HLS_7_VPS_P0300_27
     1640   
    16471641    if ( vps.getNumOutputLayersInOutputLayerSet( olsIdx ) == 1 &&
    16481642        vps.getNumDirectRefLayers( vps.getOlsHighestOutputLayerId( olsIdx ) ) )
    … …  
    16581652      }
    16591653    }
    1660 #else
    1661     vps.setAltOutputLayerFlag( olsIdx , false);     
    1662 #endif
    16631654  }
    16641655}

  • branches/HTM-11.1-dev0/source/App/TAppEncoder/TAppEncTop.h

    r964 r973  
    7575
    7676  TComPicLists               m_ivPicLists;                  ///< picture buffers of encoder instances
    77 #if H_MV_HLS_8
     77#if H_MV
    7878  TComVPS*                   m_vps;                         ///< vps
    7979#else

  • branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComPic.cpp

    r964 r973  
    5555, m_bReconstructed                        (false)
    5656, m_bNeededForOutput                      (false)
    57 #if H_MV_HLS_7_VPS_P0300_27
     57#if H_MV
    5858, m_bPicOutputFlag                        (false)
    5959#endif

  • branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComPic.h

    r964 r973  
    6969  Bool                  m_bReconstructed;
    7070  Bool                  m_bNeededForOutput;
    71 #if H_MV_HLS_7_VPS_P0300_27
     71#if H_MV
    7272  Bool                  m_bPicOutputFlag;         // Semantics variable
    7373#endif
    … …  
    178178  Void          setOutputMark (Bool b) { m_bNeededForOutput = b;     }
    179179  Bool          getOutputMark ()       { return m_bNeededForOutput;  }
    180  #if H_MV_HLS_7_VPS_P0300_27
     180 #if H_MV
    181181  Void          setPicOutputFlag(Bool b) { m_bPicOutputFlag = b;      }
    182182  Bool          getPicOutputFlag()       { return m_bPicOutputFlag ;  }

  • branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r971 r973  
    44074407  }
    44084408}
    4409 #endif
     4409
     4410Void Window::scaleOffsets( Int scal )
     4411{
     4412  if (! m_scaledFlag )
     4413  {
     4414    m_scaledFlag         = true;
     4415    m_winLeftOffset     *= scal;
     4416    m_winRightOffset    *= scal;
     4417    m_winTopOffset      *= scal;
     4418    m_winBottomOffset   *= scal;
     4419  }
     4420}
     4421#endif
     4422

  • branches/HTM-11.1-dev0/source/Lib/TLibCommon/TComSlice.h

    r971 r973  
    12461246  Void          setScaledFlag(Bool flag)          { m_scaledFlag = flag;  }
    12471247  Bool          getScaledFlag() const             { return m_scaledFlag;  }
    1248   Void          scaleOffsets( Int scal )         
    1249   {
    1250     if (! m_scaledFlag )
    1251     {
    1252       m_scaledFlag         = true;
    1253       m_winLeftOffset     *= scal;
    1254       m_winRightOffset    *= scal;
    1255       m_winTopOffset      *= scal;
    1256       m_winBottomOffset   *= scal;
    1257     }
    1258   }
     1248  Void          scaleOffsets( Int scal );
    12591249#endif
    12601250  Void          setWindow(Int offsetLeft, Int offsetLRight, Int offsetLTop, Int offsetLBottom)

  • branches/HTM-11.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r971 r973  
    336336#endif
    337337
    338 
    339 /////////////////////////////////////////////////////////////////////////////////////////
    340 ///////////////////////////////////   HTM-11.0 Integrations                  //////////////////////////////
    341 /////////////////////////////////////////////////////////////////////////////////////////
    342 #if H_MV
    343 #define H0044_POC_LSB_NOT_PRESENT        1      ///< JCT3V-H0044: Add constraint checking on the value of poc_reset_idc and poc_lsb_val
    344 #define H0056_EOS_CHECKS                 1      ///< JCT3V-H0056: Put checks on handling EOS
    345 #endif
    346 /////////////////////////////////////////////////////////////////////////////////////////
    347 ///////////////////////////////////   TBD                  //////////////////////////////
    348 /////////////////////////////////////////////////////////////////////////////////////////
    349 
    350 
    351 #define H_MV_HLS_8                           1 // General changes
    352 #define H_MV_HLS_7_VPS_P0300_27              1 // Output part only. (VPS/P0300/alt output layer flag) #27 Change alt output layer flag to be signalled within the loop of output layer sets, from JCTVC-P0300-v2. Decision: Adopt.
    353 #define MV_FIX_DEP_TYPES                     1
    354 
    355 
     338/////////////////////////////////////////////////////////////////////////////////
     339///////////////////////////////////   MV_HEVC HLS  //////////////////////////////
     340/////////////////////////////////////////////////////////////////////////////////
     341// TBD: Check if integration is necessary.
    356342#define H_MV_HLS7_GEN                        0  // General changes (not tested)
    357343
    … …  
    399385//#define H_MV_HLS_8_MIS_Q0078_24  0 // #24 (MISC   /Q0078/scan and pic type) , Items 3 b,c and 4, clarifying which pictures in an output layer sets are applied the values of general_progressive_source_flag, general_interlaced_source_flag, general_non_packed_constraint_flag and general_frame_only_constraint_flag.
    400386//#define H_MV_HLS_7_HRD_P0138_6   0 //     (HRD/P0138/HRD parameters for bitstreams excluding) #6 Decision: Adopt (as revised in updated contribution, with the specification of a flag in the BP SEI (HRD/P0192/sub-DPB) #12 Establish sub-DPBs based on the representation format indicated at the VPS level. It was suggested that the expressed shared capacity limit would need to be less than or equal to the sum of the individual capacity limits. Decision: Adopt as modified. Further study is encouraged on profile/level constraint selections.
    401 
    402 #define H_MV_HLS_8_SYN_Q0041_03    1   // #3  Syntax only (HS     /Q0041/hybrid scalability) The proposed text was endorsed, with non-editorial open issues considered as follows
    403 :// #define H_MV_HLS_7_OTHER_P0187_1          0 // (OTHER/P0187/NoOutputOfPriorPicsFlag) #1 Inference of NoOutputOfPriorPicsFlag and proposes to take into account colour format and bit depth for the inference in addition to spatial resolution
    404 #define H_MV_HLS_8_SYN_39_19       1   // #39 Syntax only + (PS/Q0165,Q0078/presence of num_add_output_layer_sets) proposal 2. change condition for presence of num_add_output_layer_sets to avoid sending it when there is only one layer set.
    405 #define H_MV_HLS_8_HRD_Q0101_04    1   // #4  (HRD    /Q0101/Bitstream part buffer) On Bitstream Partition Buffer. Decision (BF/Cleanup): Adopt (sub-proposals 1–11, refined as described).
    406 #define H_MV_HLS_8_PPS_NODOC_NN    1   // #NN (PPS    /NODOC/reserved flag): Add a flag in PPS for SHVC color gamut scalability
    407 #define H_MV_HLS_8_MIS_Q0177_47    1   // #47 (MISC   /Q0177/EOS NAL) proposal 2: clarification of description of end of sequence NAL unit
    408 #define H_MV_HLS_8_HRD_Q0182_05    1   // #5  (HRD    /Q0182/Bitstream part buffer) Decision (BF/Cleanup/Ed): Adopted (such that we use the main proposal for sub-proposal 1, and alternative 1 for sub-proposal 2). + #define H_MV_HLS_8_HRD_Q0182_06  0 // #6  (HRD    /Q0182/hrd_parameters) Sub-proposal 2 Alternative 1: Clarify that the VPS hrd_parameters( ) syntax structure that applies to the layer set which is associated with the bitstream partition initial arrival time SEI message is used to determine the lengths of the nal_initial_arrival_delay[ i ] and vcl_initial_arrival_delay[ i ] syntax elements. Decision (BF/Cleanup/Ed): Adopted alternative 1 for sub-proposal 2
    409 #define H_MV_HLS_8_SPS_NODOC_48    1   // #48 (SPS    /NODOC/PPS extension cleanups) Alignment with RExt
    410 #define H_MV_HLS_8_DBP_NODOC_42    1   // #42 (DBP    /NODOC/sharing) Remove sub-DPB sharing and processes that mark inter-layer reference pictures as "unused for reference"
    411 #define H_MV_HLS_8_RPS_Q0100_36    1   // #36 (RPS    /Q0100/constraint to semantics) v3, add constraint to RPS semantics
    412 #define H_MV_HLS_8_POC_Q0142_32    1   // #32 (POC    /Q0142/poc_lsb_not_present_flag) v2: Add semantic constraints to poc_lsb_not_present_flag.
    413 #define H_MV_HLS_8_HRD_Q0102_08    1   // #8  (HRD    /Q0102/sps_max_dec_pic_buffering_minus1) Sub-proposal 2: A semantics bug fix is proposed for sps_max_dec_pic_buffering_minus1 as a bug-fix. In discussion, the first option was preferred. Decision (BF/Cleanup/Ed.): Adopt.
    414 #define H_MV_HLS_8_MIS_Q0102_30    1   // #30 (MISC   /Q0102/loop index) proposal 3, change the max loop index for signaling bit rate and pic rate info to MaxSubLayersInLayerSetMinus1
    415 #define H_MV_HLS_8_GEN_Q0108_13    1   // #13 (GEN    /Q0108/STSA TemporalId) Agreed to remove restriction from proposal 2, to allow STSA pics of non-base layers to have TemporalId equal to 0.
    416 #define H_MV_HLS_8_PMS_Q0195_21    1   // #21 (PS     /Q0195/constraint update_ref_format_flag) proposal 2: add a semantic constraint on the value of update_ref_format_flag
    417 #define H_MV_HLS_8_PMS_Q0195_20    1   // #20 (PS     /Q0195/syntax table rep format) proposal 1: restructure syntax table for sending of rep_format_idx_present_flag and vps_num_ref_formats_minus1
    418 #define H_MV_HLS_8_MIS_Q0177_22    1   // #22 (MISC   /Q0177/inference sps_temporal_id_nesting_flag) proposal 1: modify inference rule for sps_temporal_id_nesting_flag when it is not present
    419 #define H_MV_HLS_8_PMS_Q0165_18    1   // #18 (PS     /Q0165/disallow an empty layer set) proposal 1.a), add a constraint to disallow an empty layer set
    420 #define H_MV_HLS_8_RPS_Q0060_17    1   // #17 (RPS    /Q0060/condition refLayerPicIdc) Proposal 2: Add a condition to the derivation of refLayerPicIdc of (TemporalId == 0)
    421 #define H_MV_HLS_8_POC_Q0146_15    1   // #15 (POC    /Q0146/inference of poc_msb_val_present_flag) Proposal 1.1: Change inference rule in semantics of poc_msb_val_present_flag
    422 
    423 
    424387
    425388/////////////////////////////////////////////////////////////////////////////////////////

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/NALread.cpp

    r964 r973  
    127127  else
    128128  {
    129 #if H_MV_HLS_8_GEN_Q0108_13
     129#if H_MV
    130130
    131131    // If nal_unit_type is in the range of BLA_W_LP to RSV_IRAP_VCL23, inclusive, i.e. the coded

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r972 r973  
    19621962  }
    19631963 
    1964 #if H0044_POC_LSB_NOT_PRESENT
     1964#if H_MV
    19651965    UInt slicePicOrderCntLsb = 0;
    19661966#endif
    … …  
    20162016
    20172017#if H_MV
    2018 #if !H0044_POC_LSB_NOT_PRESENT
    2019     UInt slicePicOrderCntLsb = 0;
    2020 #endif
    20212018    Int iPOClsb = slicePicOrderCntLsb;  // Needed later
    20222019    if ( (rpcSlice->getLayerId() > 0 && !vps->getPocLsbNotPresentFlag( rpcSlice->getLayerIdInVps())) || !rpcSlice->getIdrPicFlag() )
    … …  
    26252622    rpcSlice->checkPocResetIdc();
    26262623
    2627 #if H0044_POC_LSB_NOT_PRESENT
    26282624    if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && slicePicOrderCntLsb > 0 )
    26292625    {
    26302626      assert( rpcSlice->getPocResetIdc() != 2 );
    26312627    }
    2632 #endif
     2628
    26332629    if( rpcSlice->getPocResetIdc() !=  0 )
    26342630    {

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

    r964 r973  
    109109  Void  parseProfileTier    (ProfileTierLevel *ptl);
    110110  Void  parseHrdParameters  (TComHRD *hrd, Bool cprms_present_flag, UInt tempLevelHigh);
    111 #if H_MV_HLS_8_HRD_Q0102_08
     111#if H_MV
    112112  Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, Int targetOlsIdx);
    113113#else

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecEntropy.h

    r964 r973  
    7777#endif
    7878
    79 #if H_MV_HLS_8_HRD_Q0102_08
     79#if H_MV
    8080  virtual Void parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, Int targetOlsIdx )       = 0;
    8181#else
    … …  
    164164  Void    decodePPS                   ( TComPPS* pcPPS )    { m_pcEntropyDecoderIf->parsePPS(pcPPS);                    }
    165165#endif
    166 #if H_MV_HLS_8_HRD_Q0102_08
     166#if H_MV
    167167  Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, Int targetOlsIdx)  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager, targetOlsIdx );         }
    168168#else

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

    r964 r973  
    248248    calcAndPrintHashStatus(*rpcPic->getPicYuvRec(), hash);
    249249  }
    250 
    251 #if !H_MV_HLS_7_VPS_P0300_27
    252 #if SETTING_PIC_OUTPUT_MARK
    253   rpcPic->setOutputMark(rpcPic->getSlice(0)->getPicOutputFlag() ? true : false);
    254 #else
    255   rpcPic->setOutputMark(true);
    256 #endif
    257   rpcPic->setReconMark(true);
    258 #endif
    259250}
    260251

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r964 r973  
    371371  m_isNoOutputPriorPics = false;
    372372#endif
    373 #if H0056_EOS_CHECKS
     373#if H_MV
    374374  m_isLastNALWasEos = false;
    375 #endif
    376 #if H_MV
    377375  m_layerId = 0;
    378376  m_viewId = 0;
    … …  
    382380  m_pcCamParsCollector = 0;
    383381#endif
    384 #if H_MV_HLS_8_HRD_Q0102_08
     382#if H_MV
    385383  m_targetOptLayerSetIdx = -1;
    386384#endif
    … …  
    511509    {
    512510      rpcPic->setOutputMark(false);
    513 #if H_MV_HLS_7_VPS_P0300_27
     511#if H_MV
    514512      rpcPic->setPicOutputFlag(false);
    515513#endif
    … …  
    521519    {
    522520      rpcPic->setOutputMark(false);
    523 #if H_MV_HLS_7_VPS_P0300_27
     521#if H_MV
    524522      rpcPic->setPicOutputFlag(false);
    525523#endif
    … …  
    568566  TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 
    569567  TComSlice::markCurrPic( pcPic );
    570 #if !H_MV_HLS_8_DBP_NODOC_42
    571   TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc );
    572 #endif
    573568#endif
    574569  m_bFirstSliceInPicture  = true;
    … …  
    590585    {
    591586      pcPicTmp->setOutputMark(false);
    592 #if H_MV_HLS_7_VPS_P0300_27
     587#if H_MV
    593588      pcPicTmp->setPicOutputFlag(false);
    594589#endif
    … …  
    670665  }
    671666
    672 #if H_MV_HLS_8_HRD_Q0102_08
     667#if H_MV
    673668  sps->inferSpsMaxDecPicBufferingMinus1( vps, m_targetOptLayerSetIdx, getLayerId(), false );
    674 #endif
    675 
    676 #if H_MV_HLS_8_RPS_Q0100_36
    677669  vps->inferDbpSizeLayerSetZero( sps, false );
    678 #endif
    679 
    680 #if H_MV_HLS_8_PMS_Q0195_21
    681670  // When the value of vps_num_rep_formats_minus1 in the active VPS is equal to 0
    682671  if ( vps->getVpsNumRepFormatsMinus1() == 0 )
    … …  
    685674    assert( sps->getUpdateRepFormatFlag() == false );
    686675  }
    687 #endif
    688 
    689 #if H_MV_HLS_8_RPS_Q0100_36
    690676  sps->checkRpsMaxNumPics( vps, getLayerId() );
    691 #endif
    692 
    693 #if H_MV_HLS_8_MIS_Q0177_22
    694677  if( m_layerId > 0 )
    695678  {
    … …  
    787770  m_apcSlicePilot->setRefPicSetInterLayer( & m_refPicSetInterLayer0, &m_refPicSetInterLayer1 );
    788771  m_apcSlicePilot->setLayerId( nalu.m_layerId );
    789 #endif
    790 
    791 #if H_MV_HLS_8_HRD_Q0102_08
    792772  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder, m_targetOptLayerSetIdx );
    793 #else
    794   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
    795773#endif
    796774  // set POC for dependent slices in skipped pictures
    … …  
    13401318    case NAL_UNIT_VPS:
    13411319      xDecodeVPS();
    1342 #if H0056_EOS_CHECKS
     1320#if H_MV
    13431321      m_isLastNALWasEos = false;
    13441322#endif
    … …  
    13551333    case NAL_UNIT_PREFIX_SEI:
    13561334    case NAL_UNIT_SUFFIX_SEI:
    1357 #if H0056_EOS_CHECKS
     1335#if H_MV
    13581336      if ( nalu.m_nalUnitType == NAL_UNIT_SUFFIX_SEI )
    13591337      {
    … …  
    13801358    case NAL_UNIT_CODED_SLICE_RASL_N:
    13811359    case NAL_UNIT_CODED_SLICE_RASL_R:
    1382 #if H0056_EOS_CHECKS
     1360#if H_MV
    13831361      if (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TRAIL_N ||
    13841362          nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_R || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TSA_N ||
    … …  
    13931371        m_isLastNALWasEos = false;
    13941372      }
    1395 #endif
    1396 #if H_MV
     1373
    13971374      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag, sliceSkippedFlag );
    13981375#else
    … …  
    14011378      break;
    14021379    case NAL_UNIT_EOS:
    1403 #if H0056_EOS_CHECKS
     1380#if H_MV
    14041381      assert( m_isLastNALWasEos == false );
    14051382      //Check layer id of the nalu. if it is not 0, give a warning message and just return without doing anything.

  • branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecTop.h

    r964 r973  
    195195  Bool*                    m_layerInitilizedFlag; // initialization Layers
    196196  static ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets
    197 #if  H_MV_HLS_8_HRD_Q0102_08
    198197  Int                      m_targetOptLayerSetIdx;
    199 #endif
    200198#else
    201199  ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets
    … …  
    234232  Bool                    m_craNoRaslOutputFlag;    //value of variable NoRaslOutputFlag of the last CRA pic
    235233#endif
    236 #if H0056_EOS_CHECKS
     234#if H_MV
    237235  Bool                    m_isLastNALWasEos;
    238236#endif
    … …  
    271269  Void  deletePicBuffer();
    272270#if H_MV
    273 #if H_MV_HLS_7_VPS_P0300_27
    274271  TComVPS* getActiveVPS() { return m_parameterSetManagerDecoder.getActiveVPS( ); }
    275 #endif
    276272  TComSPS* getActiveSPS() { return m_parameterSetManagerDecoder.getActiveSPS( m_layerId ); }
    277273#else
    … …  
    296292  Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
    297293  Void                    setLayerInitilizedFlags( Bool* val )    { m_layerInitilizedFlag = val; }
    298 #if  H_MV_HLS_8_HRD_Q0102_08
    299294  Void                    setTargetOptLayerSetIdx( Int targetOptLayerSetIdx ) { m_targetOptLayerSetIdx = targetOptLayerSetIdx; }   
    300 #endif
    301295  TComVPS*                getPrefetchedVPS      ()               { return m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); }; //Assuming that currently only one VPS is present.
    302296  Int                     getCurrPoc            ()               { return m_apcSlicePilot->getPOC(); }

  • branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r964 r973  
    23252325      std::vector<Int> temp;
    23262326      TComSlice::markCurrPic( pcPic );
    2327 #if !H_MV_HLS_8_DBP_NODOC_42
    2328       TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, temp, pcPic->getSlice(0)->getVPS(), m_layerId, pcPic->getPOC() );
    2329 #endif
    23302327#endif
    23312328      m_bFirst = false;

  • branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp

    r964 r973  
    698698  m_cSPS.setSpsScalingListRefLayerId      ( 0              );
    699699  m_cSPS.setSpsExtensionPresentFlag              ( true );
    700 #if H_MV_HLS_8_SPS_NODOC_48
    701700  m_cSPS.setSpsMultilayerExtensionFlag    ( true );
    702 #else
    703   m_cSPS.setSpsExtensionTypeFlag          ( PS_EX_T_MV ,true );
    704 #endif
    705701#if H_3D
    706 #if H_MV_HLS_8_SPS_NODOC_48
    707702  m_cSPS.setSps3dExtensionFlag            ( true );
    708 #else
    709   m_cSPS.setSpsExtensionTypeFlag          ( PS_EX_T_3D ,true );
    710 #endif
    711703#endif
    712704#endif
    … …  
    777769    m_cSPS.setNumReorderPics(m_numReorderPics[i], i);
    778770  }
    779 #if H_MV_HLS_8_HRD_Q0102_08
     771#if H_MV
    780772  for ( Int ols = 0; ols < m_cVPS->getNumOutputLayerSets(); ols++)
    781773  {
    … …  
    788780  }
    789781
    790 #if H_MV_HLS_8_RPS_Q0100_36
    791782  m_cVPS->inferDbpSizeLayerSetZero( &m_cSPS, true );
    792 #endif
    793 
    794783#endif
    795784  m_cSPS.setPCMBitDepthLuma (g_uiPCMBitDepthLuma);
    … …  
    853842  m_cPPS.setPPSId( getLayerIdInVps() );
    854843  m_cPPS.setSPSId( getLayerIdInVps() );
    855 #if H_MV_HLS_8_SPS_NODOC_48
    856844  m_cPPS.setPpsMultilayerExtensionFlag    ( true );
    857845#if H_3D
    858846  m_cPPS.setPps3dExtensionFlag            ( true );
    859 #endif
    860 #else
    861   m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_MV ,true );
    862 #if H_3D
    863   m_cPPS.setPpsExtensionTypeFlag          ( PPS_EX_T_3D ,true );
    864 #endif
    865847#endif
    866848#endif
Note: See TracChangeset for help on using the changeset viewer.