remove macro JVET_L0118_ALIGN_MTS_INDEX

45150b01 · Karsten Suehring · edc771ff · 45150b01 · 45150b01
Commit 45150b01 authored Jan 18, 2019 by Karsten Suehring
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 14 deletions

source/Lib/CommonLib/TrQuant.cpp source/Lib/CommonLib/TrQuant.cpp +0 -13

source/Lib/CommonLib/TypeDef.h source/Lib/CommonLib/TypeDef.h +0 -1

No files found.
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -281,21 +281,8 @@ void TrQuant::getTrTypes ( TransformUnit tu, const ComponentID compID, int &trTy
        int indHor = tu.emtIdx &  1;
        int indVer = tu.emtIdx >> 1;
        
-#if JVET_L0118_ALIGN_MTS_INDEX
        trTypeHor = indHor ? DCT8 : DST7;
        trTypeVer = indVer ? DCT8 : DST7;
-#else
-        if ( CU::isIntra( *tu.cu ) )
-        {
-          trTypeHor = indHor ? DCT8 : DST7;
-          trTypeVer = indVer ? DCT8 : DST7;
-        }
-        else
-        {
-          trTypeHor = indHor ? DST7 : DCT8;
-          trTypeVer = indVer ? DST7 : DCT8;
-        }
-#endif
      }
    }
  }

--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -55,7 +55,6 @@



-#define JVET_L0118_ALIGN_MTS_INDEX                        1 // Align mts_index on intra and inter

 #define JVET_L0377_AMVR_ROUNDING_ALIGN                    1 // Align AMVR rounding for AMVP candidate