Changeset 296 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncCfg.h


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/App/TAppEncoder/TAppEncCfg.h

    r210 r296  
    7373  Int       m_iSourceWidth;                                   ///< source width in pixel
    7474  Int       m_iSourceHeight;                                  ///< source height in pixel
    75 #if PIC_CROPPING
    7675  Int       m_croppingMode;
    7776  Int       m_cropLeft;
     
    7978  Int       m_cropTop;
    8079  Int       m_cropBottom;
    81 #endif
    8280  Int       m_iFrameToBeEncoded;                              ///< number of encoded frames
    83 #if !PIC_CROPPING
    84   Bool      m_bUsePAD;                                        ///< flag for using source padding
    85 #endif
    8681  Int       m_aiPad[2];                                       ///< number of padded pixels for width and height
    8782 
     
    10095  Int       m_extraRPSs[MAX_VIEW_NUM];
    10196  GOPEntryMvc m_GOPListsMvc[MAX_VIEW_NUM][MAX_GOP+1];
    102 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    10397  Int       m_numReorderPics[MAX_VIEW_NUM][MAX_TLAYER];       ///< total number of reorder pictures
    10498  Int       m_maxDecPicBuffering[MAX_VIEW_NUM][MAX_TLAYER];   ///< total number of reference pictures needed for decoding
    105 #else
    106   Int       m_numReorderFrames;                               ///< total number of reorder pictures
    107   Int       m_maxNumberOfReferencePictures;                   ///< total number of reference pictures needed for decoding
    108 #endif
    10999  Bool      m_bUseLComb;                                      ///< flag for using combined reference list for uni-prediction in B-slices (JCTVC-D421)
    110100  Bool      m_bLCMod;                                         ///< flag for specifying whether the combined reference list for uni-prediction in B-slices is uploaded explicitly
     
    136126  Int       m_iQPAdaptationRange;                             ///< dQP range by QP adaptation
    137127 
    138 #if H0566_TLA
    139128  Int       m_maxTempLayer[MAX_VIEW_NUM];                     ///< Max temporal layer
    140 #else
    141   Bool      m_bTLayering;                                     ///< indicates whether temporal IDs are set based on the hierarchical coding structure
    142   Bool      m_abTLayerSwitchingFlag[MAX_TLAYER];              ///< temporal layer switching flags corresponding to each temporal layer
    143 #endif
    144129
    145130  // coding unit (CU) definition
     
    170155  vector<Bool> m_abUseSAO;
    171156#if LGE_ILLUCOMP_B0045
     157#if LGE_ILLUCOMP_DEPTH_C0046
     158  vector<Bool> m_abUseIC;                                    ///< flag for using illumination compensation for inter-view prediction
     159#else
    172160  Bool      m_bUseIC;                                     ///< flag for using illumination compensation for inter-view prediction
    173161#endif
    174 #if SAO_UNIT_INTERLEAVING
     162#endif
     163#if INTER_VIEW_VECTOR_SCALING_C0115
     164  Bool      m_bUseIVS;                                        ///< flag for using inter-view vector scaling
     165#endif
    175166  Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture
    176167  Bool      m_saoInterleavingFlag;                            ///< SAO interleaving flag
    177 #endif
    178168  // coding tools (loop filter)
    179169  vector<Bool> m_abUseALF;                                    ///< flag for using adaptive loop filter [0] - video, [1] - depth
     
    181171 
    182172  Int       m_iALFMaxNumberFilters;                           ///< ALF Max Number Filters in one picture
    183 #if LCU_SYNTAX_ALF
    184173  Bool      m_bALFParamInSlice;
    185174  Bool      m_bALFPicBasedEncode;
    186 #endif
    187175
    188176  vector<Bool> m_abLoopFilterDisable;                         ///< flag for using deblocking filter filter [0] - video, [1] - depth
     
    190178  Int       m_loopFilterBetaOffsetDiv2;                     ///< beta offset for deblocking filter
    191179  Int       m_loopFilterTcOffsetDiv2;                       ///< tc offset for deblocking filter
    192 #if DBL_CONTROL
    193180  Bool      m_DeblockingFilterControlPresent;                 ///< deblocking filter control present flag in PPS
    194 #endif
    195181 
    196182  Bool      m_bUseLMChroma;                                  ///< JL: Chroma intra prediction based on luma signal
     
    226212  UInt      m_uiPredDepthMapGeneration;                       ///< using of (virtual) depth maps for texture coding
    227213#endif
    228 #if HHI_INTER_VIEW_MOTION_PRED
     214#if H3D_IVMP
    229215  UInt      m_uiMultiviewMvPredMode;                          ///< usage of predictors for multi-view mv prediction
    230216  UInt      m_uiMultiviewMvRegMode;                           ///< regularization for multiview motion vectors
    231217  Double    m_dMultiviewMvRegLambdaScale;                     ///< lambda scale for multiview motion vectors regularization
    232218#endif
    233 #if HHI_INTER_VIEW_RESIDUAL_PRED
     219#if H3D_IVRP
    234220  UInt      m_uiMultiviewResPredMode;          ///< using multiview residual prediction
    235221#endif
    236222
    237 #if FAST_DECISION_FOR_MRG_RD_COST
    238223  Bool      m_useFastDecisionForMerge;         ///< flag for using Fast Decision Merge RD-Cost
    239 #endif
    240224  Bool      m_bUseCbfFastMode;                 ///< flag for using Cbf Fast PU Mode Decision
    241225  Int       m_iSliceMode;                      ///< 0: Disable all Recon slice limits, 1 : Maximum number of largest coding units per slice, 2: Maximum number of bytes in a slice
     
    250234  Int       m_iColumnRowInfoPresent;
    251235  Int       m_iUniformSpacingIdr;
    252 #if !REMOVE_TILE_DEPENDENCE
    253   Int       m_iTileBoundaryIndependenceIdr;
    254 #endif
    255236  Int       m_iNumColumnsMinus1;
    256237  char*     m_pchColumnWidth;
     
    280261#endif
    281262
    282 #if MULTIBITS_DATA_HIDING
    283263  Int       m_signHideFlag;
    284264  Int       m_signHidingThreshold;
    285 #endif
    286265#if HHI_MPI
    287266  Bool      m_bUseMVI;  ///< flag for using Motion Vector Inheritance for depth map coding
Note: See TracChangeset for help on using the changeset viewer.