Changeset 1129 in 3DVCSoftware for branches/HTM-13.0-MV-draft-2/source/Lib


Ignore:
Timestamp:
10 Nov 2014, 14:34:55 (10 years ago)
Author:
tech
Message:

Removed 3D-HEVC related code and cfg files.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-13.0-MV-draft-2/source/Lib/TLibCommon/TypeDef.h

    r1128 r1129  
    5151   make HEVC_EXT=0  -> H_MV=0 H_3D=0   --> plain HM
    5252   make HEVC_EXT=1  -> H_MV=1 H_3D=0   --> MV only
    53    make HEVC_EXT=2  -> H_MV=1 H_3D=1   --> full 3D
     53
    5454*/
    5555
    5656#ifndef HEVC_EXT
    57 #define HEVC_EXT                    2
    58 #endif
    59 
    60 #if ( HEVC_EXT < 0 )||( HEVC_EXT > 2 )
    61 #error HEVC_EXT must be in the range of 0 to 2, inclusive.
     57#define HEVC_EXT                    1
     58#endif
     59
     60#if ( HEVC_EXT < 0 )||( HEVC_EXT > 1 )
     61#error HEVC_EXT must be in the range of 0 to 1, inclusive.
    6262#endif
    6363
    6464#define H_MV          ( HEVC_EXT != 0)
    65 #define H_3D          ( HEVC_EXT == 2)
    66 
    67 #define NTT_BUG_FIX_TK54    1
    68 #define BUG_FIX_TK65        1
    69 
    70 #define MTK_I0093           1
     65
    7166/////////////////////////////////////////////////////////////////////////////////////////
    7267///////////////////////////////////   MAJOR DEFINES   /////////////////////////////////// 
    7368/////////////////////////////////////////////////////////////////////////////////////////
    74 
    7569#if H_MV
    7670#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
    7771#endif
    78 
    79 
    80 
    81 
    82 /////////////////////////////////////////////////////////////////////////////////////////
    83 ///////////////////////////////////   DERIVED DEFINES /////////////////////////////////// 
    84 /////////////////////////////////////////////////////////////////////////////////////////
    85 
    86 // Fixes
    87 
    88 
    89 #define H_MV_FIX_REF_LAYER_PIC_FLAG            1
    90 #define H_MV_FIX_NUM_VIEWS                     1
    91 #define H_3D_OUTPUT_ACTIVE_TOOLS               0
    92 
    93 ///// ***** SINGLE DEPTH MODE *********
    94 
    95 ///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    96 
    97 ////   ****** NEIGHBOURING BLOCK-BASED DISPARITY VECTOR  *********
    98 
    99 ///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION *********
    100 
    101 ///// ***** DEPTH INTRA MODES *********
    102 ///// ***** VIEW SYNTHESIS PREDICTION *********
    103 
    104 
    105 ///// ***** ILLUMATION COMPENSATION *********
    106 
    107 
    108 ///// ***** DEPTH BASED BLOCK PARTITIONING *********
    109 
    110 
    111 ///// ***** FCO *********
    112 #define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
    113 
    114 
    115 
    116 
    11772/////////////////////////////////////////////////////////////////////////////////
    11873///////////////////////////////////   MV_HEVC HLS  //////////////////////////////
    11974/////////////////////////////////////////////////////////////////////////////////
    120 // TBD: Check if integration is necessary.
     75// Fixes
     76#define H_MV_FIX_REF_LAYER_PIC_FLAG            1
     77#define H_MV_FIX_NUM_VIEWS                     1
    12178
    12279#define H_MV_HLS_FIX                         1
    … …  
    12481#define H_MV_HLS7_GEN                        0  // General changes (not tested)
    12582#define H_MV_ALIGN_HM_15                     1 
    126 
    127 // POC
    128 // #define H_MV_HLS_7_POC_P0041_3            0 // (POC/P0041/POC reset) #3 It was remarked that we should require each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture. This was agreed. Decision: Adopt (with constraint for discardable_flag as described above)
    129 // #define H_MV_HLS_7_POC_P0041_FIXES        0 // (POC/P0041/Fixes) For each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture.
    130 // #define H_MV_HLS_7_POC_P0056_4            0 // (POC/P0056/layer tree poc) #4 Proposal 1: If the POC reset approach is adopted as the basis for multi-layer POC derivation, it is proposed to derive the POC anchor picture from the previous TID0 picture (that is not a RASL picture, a RADL picture or a sub-layer non-reference picture and not with discardable_flag equal to 1) of  the current layer or any of its reference layer. This is asserted to improve loss resilience and reduce bit rate overhead. Decision: Adopt Proposal 1 (with the suggested modifications Ewith text provided as P0297).
    131 
    132 // SEI related
    133 //#define H_MV_HLS_8_SEI_NODOC_53  0 // #53 (SEI    /NODOC/Added Multiview view position SEI message) Plain copy from AVC.
    134 //#define H_MV_HLS_8_SEI_NODOC_52  0 // #52 (SEI    /NODOC/Added Multiview acquisition information SEI) Plain copy from AVC.
    135 //#define H_MV_HLS_8_SEI_NODOC_51  0 // #51 (SEI    /NODOC/Added Multiview scene information SEI message)
    136 //#define H_MV_HLS_8_SEI_Q0189_35  0 // #35 (SEI    /Q0189/SEI message for indicating constraints on TMVP) Proposal 2.3,  SEI message for indicating constraints on TMVP
    137 //#define H_MV_HLS_8_EDF_Q0116_29  0 // #29 (ED.FIX /Q0116/Recovery point SEI) , consider adding a note regarding how random accessibility is affected by the recovery point SEI message
    138 //#define H_MV_HLS_8_GEN_Q0183_23  0 // #23 (GEN    /Q0183/SEI clean-ups) numerous small clean-ups on SEI messages.
    139 //#define H_MV_HLS_8_MIS_Q0247_49  0 // #49 (MISC   /Q0247/frame-field information SEI message)
    140 //#define H_MV_HLS_8_MIS_Q0189_34  0 // #34 (MISC   /Q0189/slice temporal mvp enabled flag) Proposal 2.2, clarification of semantics of slice temporal mvp enabled flag
    141 //#define H_MV_HLS_8_EDF_Q0081_01  0 // #1  (ED.FIX /Q0081/alpha channel persist) On reuse of alpha planes in auxiliary pictures. It was asked why there would not be a presumption that the alpha channel content would simply persist, without needing the flag to indicate it. Decision (Ed.): Delegated to editors to clarify, as necessary, that the alpha channel content persists until cancelled or updated in output order.
    142 //#define H_MV_HLS_8_SEI_Q0253_37  0 // #37 (SEI    /Q0253/layer not present), modified semantics of layers not present SEI message to correct bug introduced during editing
    143 //#define H_MV_HLS_8_SEI_Q0045_11  0 // #11 (SEI    /Q0045/Overlay) Proposal for an SEI message on selectable overlays. Decision: Adopt (modified for variable-length strings).
    144 //#define H_MV_HLS_7_SEI_P0133_28  0 // (SEI/P0133/Recovery point SEI) #28 Decision: Adopt change to recover point semantics only (-v3)
    145 //#define H_MV_HLS_7_SEI_P0123_25  0 // (SEI/P0123/Alpha channel info) #25 Add alpha channel information SEI message Decision: Adopt. Constrain the bit depth indicated to be equal to the coded bit depth of the aux picture.
    146 
    147 // DPB
    148 //#define H_MV_HLS_8_HRD_Q0102_09  0 // #9  (HRD    /Q0102/NoOutputOfPriorPicsFlag) It was suggested that also the separate_colour_plane_flag should affect inference of NoOutputOfPriorPicsFlag. Decision (Ed.): Agreed (affects RExt text).
    149 //#define H_MV_HLS_8_DBP_Q0154_38  0 // #38 (DBP    /Q0154/VPS DPB) Proposal in C.5.2.1: Add in the decoding process that when a new VPS is activated, all pictures in the DPB are marked as unused for reference
    150 //#define H_MV_HLS_8_HRD_Q0154_10  0 // #10 (HRD    /Q0154/DPB Flushing and parameters) On picture flushing and DPB parameters Decision: Adopted (some details to be discussed further in BoG).
    151 //#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
    152 
    153 // OTHERS
    154 //#define H_MV_HLS_8_HSB_Q0041_03  0 // #3  (HS     /Q0041/hybrid scalability) The proposed text was endorsed, with non-editorial open issues considered as follows ?// #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
    155 //#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.
    156 //#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.
    15783
    15884/////////////////////////////////////////////////////////////////////////////////////////
    … …  
    174100#define TILE_SIZE_CHECK 1
    175101
    176 #define FIX1172 1 ///< fix ticket #1172
     102#define FIX1172                     1 ///< fix ticket #1172
    177103
    178104#define SETTING_PIC_OUTPUT_MARK     1
Note: See TracChangeset for help on using the changeset viewer.