| 1 | diff -r ../TMuC0.7/source//Lib/TLibCommon/TComTrQuant.cpp source//Lib/TLibCommon/TComTrQuant.cpp |
|---|
| 2 | 6911c6911,6912 |
|---|
| 3 | < if( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiBlkSizeM1 ) ) || |
|---|
| 4 | --- |
|---|
| 5 | > #if HHI_TRANSFORM_SCAN |
|---|
| 6 | > if( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiBlkSizeM1 ) ) || |
|---|
| 7 | 6915a6917,6924 |
|---|
| 8 | > #else |
|---|
| 9 | > if( uiScanPos && |
|---|
| 10 | > ( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiBlkSizeM1 ) ) || |
|---|
| 11 | > ( uiDownLeft == 0 && ( uiPosY == 0 || uiPosX == uiBlkSizeM1 ) ) ) ) |
|---|
| 12 | > { |
|---|
| 13 | > uiDownLeft = 1 - uiDownLeft; |
|---|
| 14 | > } |
|---|
| 15 | > #endif |
|---|
| 16 | 7183a7193 |
|---|
| 17 | > #if HHI_TRANSFORM_SCAN |
|---|
| 18 | 7188a7199,7206 |
|---|
| 19 | > #else |
|---|
| 20 | > if( uiScanPos && |
|---|
| 21 | > ( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiBlkSizeM1 ) ) || |
|---|
| 22 | > ( uiDownLeft == 0 && ( uiPosY == 0 || uiPosX == uiBlkSizeM1 ) ) ) ) |
|---|
| 23 | > { |
|---|
| 24 | > uiDownLeft = 1 - uiDownLeft; |
|---|
| 25 | > } |
|---|
| 26 | > #endif |
|---|
| 27 | 7232a7251 |
|---|
| 28 | > #if HHI_TRANSFORM_SCAN |
|---|
| 29 | 7237a7257,7264 |
|---|
| 30 | > #else |
|---|
| 31 | > if( uiScanPos && |
|---|
| 32 | > ( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiBlkSizeM1 ) ) || |
|---|
| 33 | > ( uiDownLeft == 0 && ( uiPosY == 0 || uiPosX == uiBlkSizeM1 ) ) ) ) |
|---|
| 34 | > { |
|---|
| 35 | > uiDownLeft = 1 - uiDownLeft; |
|---|
| 36 | > } |
|---|
| 37 | > #endif |
|---|
| 38 | diff -r ../TMuC0.7/source//Lib/TLibCommon/TypeDef.h source//Lib/TLibCommon/TypeDef.h |
|---|
| 39 | 55a56,58 |
|---|
| 40 | > #ifdef HHI_TRANSFORM_CODING |
|---|
| 41 | > #define HHI_TRANSFORM_SCAN 0 ///< adaptive scan selection |
|---|
| 42 | > #endif |
|---|
| 43 | diff -r ../TMuC0.7/source//Lib/TLibDecoder/TDecSbac.cpp source//Lib/TLibDecoder/TDecSbac.cpp |
|---|
| 44 | 1571a1572 |
|---|
| 45 | > #if HHI_TRANSFORM_SCAN |
|---|
| 46 | 1576a1578,1585 |
|---|
| 47 | > #else |
|---|
| 48 | > if( uiScanPos && |
|---|
| 49 | > ( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiHeight - 1 ) ) || |
|---|
| 50 | > ( uiDownLeft == 0 && ( uiPosY == 0 || uiPosX == uiWidth - 1 ) ) ) ) |
|---|
| 51 | > { |
|---|
| 52 | > uiDownLeft = 1 - uiDownLeft; |
|---|
| 53 | > } |
|---|
| 54 | > #endif |
|---|
| 55 | diff -r ../TMuC0.7/source//Lib/TLibEncoder/TEncSbac.cpp source//Lib/TLibEncoder/TEncSbac.cpp |
|---|
| 56 | 1457a1458 |
|---|
| 57 | > #if HHI_TRANSFORM_SCAN |
|---|
| 58 | 1462a1464,1471 |
|---|
| 59 | > #else |
|---|
| 60 | > if( uiScanPos && |
|---|
| 61 | > ( ( uiDownLeft == 1 && ( uiPosX == 0 || uiPosY == uiHeight - 1 ) ) || |
|---|
| 62 | > ( uiDownLeft == 0 && ( uiPosY == 0 || uiPosX == uiWidth - 1 ) ) ) ) |
|---|
| 63 | > { |
|---|
| 64 | > uiDownLeft = 1 - uiDownLeft; |
|---|
| 65 | > } |
|---|
| 66 | > #endif |
|---|
| 67 | Only in source/: delete unnecessary.bat |
|---|
