Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/CommonDef.h


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/CommonDef.h

    r1406 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    7272#if NH_MV
    7373#define NV_VERSION        "16.2"                ///< Current software version
    74 #define HM_VERSION        "16.9"                ///<
    75 #else
    76 #define NV_VERSION        "16.9"                 ///< Current software version
     74#define HM_VERSION        "16.18"                ///<
     75#else
     76#define NV_VERSION        "16.18"                 ///< Current software version
    7777#endif
    7878// ====================================================================================================================
     
    267267static const Int LAST_SIGNIFICANT_GROUPS =                        10 ;
    268268
    269 #if W0038_DB_OPT
    270269static const Int MAX_ENCODER_DEBLOCKING_QUALITY_LAYERS =           8 ;
    271 #endif
    272 
    273270
    274271#if NH_MV
     
    290287#endif
    291288
     289static const UInt LUMA_LEVEL_TO_DQP_LUT_MAXSIZE =                1024; ///< max LUT size for QP offset based on luma
     290
     291
    292292// ====================================================================================================================
    293293// Macro functions
     
    373373#endif
    374374
    375 #if NH_3D_MLC  || NH_3D_ARP
     375#if NH_3D
    376376#define MRG_MAX_NUM_CANDS_MEM       (MRG_MAX_NUM_CANDS+1) // one extra for inter-view motion prediction
    377377#endif
Note: See TracChangeset for help on using the changeset viewer.