Changeset 937 in 3DVCSoftware


Ignore:
Timestamp:
22 Apr 2014, 16:33:23 (10 years ago)
Author:
tech
Message:

Added missing guard macros ETRIKHU_CLEANUP_H0083_MISSING.

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

Legend:

Unmodified
Added
Removed

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

    r936 r937  
    229229#define ETRIKHU_BUGFIX_H0083              1   // bug-fix for DV candidate pruning
    230230#define ETRIKHU_CLEANUP_H0083             1   // cleaned-up source code for constructing merging candidate list
     231#define ETRIKHU_CLEANUP_H0083_MISSING     1   // missing guard macros added by GT
    231232#define SHARP_SIMPLE_MERGE_H0062          1   // Restrict 3D-HEVC merge cand in small PUs
    232233#define MTK_DIS_SPBIP8X4_H0205            1   // Disable bi-prediction for 8x4 and 4x8 sub PU and remove the SPIVMP 2Nx2N restriction

  • branches/HTM-10.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r936 r937  
    437437      , inheritedVSPDisInfo
    438438#if H_3D_SPIVMP
     439#if !ETRIKHU_CLEANUP_H0083_MISSING
     440      , bSPIVMPFlag
     441#endif
    439442      , pcMvFieldSP, puhInterDirSP
    440443#endif

  • branches/HTM-10.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r936 r937  
    312312            , inheritedVSPDisInfo
    313313#if H_3D_SPIVMP
     314#if !ETRIKHU_CLEANUP_H0083_MISSING
     315            , bSPIVMPFlag
     316#endif
    314317            , pcMvFieldSP, puhInterDirSP
    315318#endif

  • branches/HTM-10.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r936 r937  
    18201820      , inheritedVSPDisInfo
    18211821#if H_3D_SPIVMP
     1822#if !ETRIKHU_CLEANUP_H0083_MISSING
     1823      , bSPIVMPFlag
     1824#endif
    18221825      , pcMvFieldSP, puhInterDirSP
    18231826#endif

  • branches/HTM-10.2-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r936 r937  
    37053705#endif
    37063706#if H_3D_SPIVMP
     3707#if !ETRIKHU_CLEANUP_H0083_MISSING
     3708        , pbSPIVMPFlag
     3709#endif
    37073710        , pcMvFieldSP, puhInterDirSP
    37083711#endif
    … …  
    37403743#endif
    37413744#if H_3D_SPIVMP
     3745#if !ETRIKHU_CLEANUP_H0083_MISSING
     3746      , pbSPIVMPFlag
     3747#endif
    37423748      , pcMvFieldSP, puhInterDirSP
    37433749#endif
Note: See TracChangeset for help on using the changeset viewer.