Changeset 973 in 3DVCSoftware for branches/HTM-11.1-dev0/source/Lib/TLibCommon


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

Cleanup part 7.

Location:
branches/HTM-11.1-dev0/source/Lib/TLibCommon
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • 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/////////////////////////////////////////////////////////////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.