Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.cpp


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

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/Lib/TLibCommon/TComRom.cpp

    r189 r296  
    174174    g_aacWedgeRefLists.clear();
    175175  }
    176 #if HHIQC_DMMFASTSEARCH_B0039
     176
    177177  if ( !g_aacWedgeNodeLists.empty() )
    178178  {
    … …  
    183183    g_aacWedgeNodeLists.clear();
    184184  }
    185 #endif
     185
    186186#endif
    187187}
    … …  
    306306
    307307#if RWTH_SDC_DLT_B0036
     308#if SAIT_SDC_C0096
     309UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES] = { DC_IDX, DMM_WEDGE_FULL_IDX, PLANAR_IDX };
     310#else
    308311UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES] = { DC_IDX, DMM_WEDGE_FULL_IDX, DMM_WEDGE_PREDDIR_IDX, PLANAR_IDX };
     312#endif
    309313#endif
    310314
    … …  
    413417};
    414418
    415 #if !LOGI_INTRA_NAME_3MPM
    416 // Mapping each Unified Directional Intra prediction direction to DCT/DST transform
    417 // 0 implies use DCT, 1 implies DST
    418 
    419 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    420 const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+NUM_DMM_MODE] =
    421 #else
    422 const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE] =
    423 #endif
    424 { //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
    425   1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0
    426 #if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    427   , 0, 0, 0, 0, 0, 0, 0, 0
    428 #elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    429   , 0, 0, 0, 0
    430 #endif
    431 };
    432 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    433 const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+NUM_DMM_MODE] =
    434 #else
    435 const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE] =
    436 #endif
    437 { //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
    438   1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0
    439 #if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    440   , 0, 0, 0, 0, 0, 0, 0, 0
    441 #elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    442   , 0, 0, 0, 0
    443 #endif
    444 };
    445 #endif
    446419
    447420
    … …  
    478451const UChar g_aucConvertTxtTypeToIdx[4] = { 0, 1, 1, 2 };
    479452
    480 #if !LOGI_INTRA_NAME_3MPM
    481 // ====================================================================================================================
    482 // Angular Intra prediction
    483 // ====================================================================================================================
    484 
    485 // g_aucAngIntraModeOrder
    486 //   Indexing this array with the mode indicated in the bitstream
    487 //   gives a logical index used in the prediction functions.
    488 const UChar g_aucAngIntraModeOrder[NUM_INTRA_MODE] =
    489 {     //  ModeOrder LogicalOrderInPredFunctions
    490   34, //  PLANAR_IDX PLANAR PLANAR
    491   9,  //  0 VER     DC
    492   25, //  1 HOR     VER-8 (diagonal from top-left to bottom-right = HOR-8)
    493   0,  //  2 DC      VER-7
    494   1,  //  4 VER-8   VER-6
    495   5,  //  5 VER-4   VER-5
    496   13, //  6 VER+4   VER-4
    497   17, //  7 VER+8   VER-3
    498   21, //  8 HOR-4   VER-2
    499   29, //  9 HOR+4   VER-1
    500   33, // 10 HOR+8   VER
    501   3,  // 11 VER-6   VER+1
    502   7,  // 12 VER-2   VER+2
    503   11, // 13 VER+2   VER+3
    504   15, // 14 VER+6   VER+4
    505   19, // 15 HOR-6   VER+5
    506   23, // 16 HOR-2   VER+6
    507   27, // 17 HOR+2   VER+7
    508   31, // 18 HOR+6   VER+8
    509   2,  // 19 VER-7   HOR-7
    510   4,  // 20 VER-5   HOR-6
    511   6,  // 21 VER-3   HOR-5
    512   8,  // 22 VER-1   HOR-4
    513   10, // 23 VER+1   HOR-3
    514   12, // 24 VER+3   HOR-2
    515   14, // 25 VER+5   HOR-1
    516   16, // 26 VER+7   HOR
    517   18, // 27 HOR-7   HOR+1
    518   20, // 28 HOR-5   HOR+2
    519   22, // 29 HOR-3   HOR+3
    520   24, // 30 HOR-1   HOR+4
    521   26, // 31 HOR+1   HOR+5
    522   28, // 32 HOR+3   HOR+6
    523   30, // 33 HOR+5   HOR+7
    524   32, // 34 HOR+7   HOR+8
    525   0, // LM_CHROMA_IDX
    526 };
    527 
    528 const UChar g_aucIntraModeNumAng[7] =
    529 {
    530   4,  //   2x2
    531   18,  //   4x4
    532   35,  //   8x8
    533   35,  //  16x16
    534   35,  //  32x32
    535   35,  //  64x64
    536   6   // 128x128
    537 };
    538 
    539 const UChar g_aucIntraModeBitsAng[7] =
    540 {
    541   2,  //   2x2     3   1+1
    542   5,  //   4x4    17   4+1
    543   6,  //   8x8    34   5+esc
    544   6,  //  16x16   34   5+esc
    545   6,  //  32x32   34   5+esc
    546   6,  //  64x64   34   5+esc
    547   3   // 128x128   5   2+1
    548 };
    549 #endif
    550453
    551454// ====================================================================================================================
    … …  
    587490};
    588491
     492#if LGE_DMM3_SIMP_C0044
     493const UChar g_aucWedgeTexPredBitsListIdx[7] =
     494{
     495  0,   //   2x2
     496  6,   //   4x4   
     497  9,  //   8x8   
     498  9,  //  16x16   
     499  9,  //  32x32   
     500  0,  //  64x64   
     501  0    // 128x128 
     502};
     503#endif
     504
    589505const UChar g_aucIntraSizeIdxToWedgeSize[7] =
    590506{
    … …  
    630546};
    631547
    632 #if MULTILEVEL_SIGMAP_EXT
    633548const UInt g_sigLastScan8x8[ 4 ][ 4 ] =
    634549{
    … …  
    639554};
    640555UInt g_sigLastScanCG32x32[ 64 ];
    641 #endif
    642556
    643557UInt* g_auiNonSquareSigLastScan[ 4 ];
    … …  
    645559const UInt g_uiMinInGroup[ 10 ] = {0,1,2,3,4,6,8,12,16,24};
    646560const UInt g_uiGroupIdx[ 32 ]   = {0,1,2,3,4,4,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,9};
    647 #if LAST_CTX_REDUCTION
    648561const UInt g_uiLastCtx[ 28 ]    =
    649562{
    … …  
    653566  10, 11, 12, 12, 13, 13, 14, 14, 2, 2    // 32x32  10
    654567};
    655 #else
    656 const UInt g_uiLastCtx[ 28 ]    =
    657 {
    658   0,   1,  2,  2,                         // 4x4    4
    659   3,   4,  5,  5, 6,  6,                  // 8x8    6 
    660   7,   8,  9,  9, 10, 10, 11, 11,         // 16x16  8
    661   12, 13, 14, 14, 15, 15, 16, 16, 17, 17  // 32x32  10
    662 };
    663 #endif
    664568
    665569// Rice parameters for absolute transform levels
    666 #if EIGHT_BITS_RICE_CODE
    667570const UInt g_auiGoRiceRange[5] =
    668571{
    … …  
    674577  8, 7, 6, 5, 4
    675578};
    676 #else
    677 const UInt g_auiGoRiceRange[4] =
    678 {
    679   7, 20, 42, 70
    680 };
    681 
    682 const UInt g_auiGoRicePrefixLen[4] =
    683 {
    684   8, 10, 10, 8
    685 };
    686 #endif
    687 
    688 #if EIGHT_BITS_RICE_CODE
     579
    689580const UInt g_aauiGoRiceUpdate[5][24] =
    690581{
    691 #if RESTRICT_GR1GR2FLAG_NUMBER
    692582  {
    693583    0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
    … …  
    705595    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
    706596  }
    707 #else
    708   {
    709     0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
    710   },
    711   {
    712     1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
    713   },
    714   {
    715     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
    716   },
    717   {
    718     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
    719   },
    720   {
    721     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
    722   }
    723 #endif
    724 };
    725 #else
    726 const UInt g_aauiGoRiceUpdate[4][16] =
    727 {
    728 #if RESTRICT_GR1GR2FLAG_NUMBER
    729   {
    730     0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
    731   },
    732   {
    733     1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
    734   },
    735   {
    736     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
    737   },
    738   {
    739     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
    740   }
    741 #else 
    742   {
    743     0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
    744   },
    745   {
    746     1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
    747   },
    748   {
    749     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
    750   },
    751   {
    752     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
    753   }
    754 #endif
    755 };
    756 #endif
     597};
    757598
    758599// initialize g_auiFrameScanXY
    … …  
    808649  if( iWidth < 16 )
    809650  {
    810 #if MULTILEVEL_SIGMAP_EXT
    811651  UInt* pBuffTemp = pBuffD;
    812652  if( iWidth == 8 )
    … …  
    814654    pBuffTemp = g_sigLastScanCG32x32;
    815655  }
    816 #endif
    817656  for( UInt uiScanLine = 0; uiNextScanPos < uiNumScanPos; uiScanLine++ )
    818657  {
    … …  
    826665    while( iPrimDim >= 0 && iScndDim < iWidth )
    827666    {
    828 #if MULTILEVEL_SIGMAP_EXT
    829667      pBuffTemp[ uiNextScanPos ] = iPrimDim * iWidth + iScndDim ;
    830 #else
    831       pBuffD[ uiNextScanPos ] = iPrimDim * iWidth + iScndDim ;
    832 #endif
    833668      uiNextScanPos++;
    834669      iScndDim++;
    … …  
    837672  }
    838673  }
    839 #if MULTILEVEL_SIGMAP_EXT
    840674  if( iWidth > 4 )
    841 #else
    842   else
    843 #endif
    844675  {
    845676    UInt uiNumBlkSide = iWidth >> 2;
    … …  
    851682      uiNextScanPos   = 0;
    852683      UInt initBlkPos = g_auiSigLastScan[ SCAN_DIAG ][ log2Blk ][ uiBlk ];
    853 #if MULTILEVEL_SIGMAP_EXT
    854684      if( iWidth == 32 )
    855685      {
    856686        initBlkPos = g_sigLastScanCG32x32[ uiBlk ];
    857687      }
    858 #endif
    859688      UInt offsetY    = initBlkPos / uiNumBlkSide;
    860689      UInt offsetX    = initBlkPos - offsetY * uiNumBlkSide;
    … …  
    983812}
    984813
    985 #if SCALING_LIST
    986814Int g_quantIntraDefault4x4[16] =
    987815{
    … …  
    1022850  24,25,28,33,41,54,71,91
    1023851};
    1024 #else
    1025 Int g_quantIntraDefault4x4[16] =
    1026 {
    1027    6,13,20,28,
    1028   13,20,28,32,
    1029   20,28,32,37,
    1030   28,32,37,42
    1031 };
    1032 Int g_quantInterDefault4x4[16] =
    1033 {
    1034   10,14,20,24,
    1035   14,20,24,27,
    1036   20,24,27,30,
    1037   24,27,30,34
    1038 };
    1039 
    1040 Int g_quantIntraDefault8x8[64] =
    1041 {
    1042    6,10,13,16,18,23,25,27,
    1043   10,11,16,18,23,25,27,29,
    1044   13,16,18,23,25,27,29,31,
    1045   16,18,23,25,27,29,31,33,
    1046   18,23,25,27,29,31,33,36,
    1047   23,25,27,29,31,33,36,38,
    1048   25,27,29,31,33,36,38,40,
    1049   27,29,31,33,36,38,40,42
    1050 };
    1051 
    1052 Int g_quantInterDefault8x8[64] =
    1053 {
    1054    9,13,15,17,19,21,22,24,
    1055   13,13,17,19,21,22,24,25,
    1056   15,17,19,21,22,24,25,27,
    1057   17,19,21,22,24,25,27,28,
    1058   19,21,22,24,25,27,28,30,
    1059   21,22,24,25,27,28,30,32,
    1060   22,24,25,27,28,30,32,33,
    1061   24,25,27,28,30,32,33,35
    1062 };
    1063 
    1064 Int g_quantIntraDefault16x16[256] =
    1065 {
    1066   16,16,16,16,16,16,16,16,17,17,18,19,21,22,24,27,
    1067   16,16,16,16,16,16,16,16,17,18,18,20,21,23,25,27,
    1068   16,16,16,16,16,16,16,17,17,18,19,20,22,23,25,28,
    1069   16,16,16,16,16,16,17,17,18,19,20,21,23,25,27,29,
    1070   16,16,16,16,17,17,18,19,20,21,22,23,25,27,29,31,
    1071   16,16,16,16,17,18,19,20,22,23,24,26,27,29,32,34,
    1072   16,16,16,17,18,19,21,23,24,25,27,29,31,33,36,39,
    1073   16,16,17,17,19,20,23,25,27,29,31,33,35,38,41,44,
    1074   17,17,17,18,20,22,24,27,30,32,35,38,41,44,47,51,
    1075   17,18,18,19,21,23,25,29,32,36,40,43,47,51,55,60,
    1076   18,18,19,20,22,24,27,31,35,40,44,49,54,59,65,70,
    1077   19,20,20,21,23,26,29,33,38,43,49,56,62,69,75,82,
    1078   21,21,22,23,25,27,31,35,41,47,54,62,70,79,88,97,
    1079   22,23,23,25,27,29,33,38,44,51,59,69,79,90,101,113,
    1080   24,25,25,27,29,32,36,41,47,55,65,75,88,101,115,130,
    1081   27,27,28,29,31,34,39,44,51,60,70,82,97,113,130,149
    1082 };
    1083 
    1084 Int g_quantInterDefault16x16[256] =
    1085 {
    1086   16,16,16,16,16,16,16,16,17,17,18,19,20,21,22,27,
    1087   16,16,16,16,16,16,16,17,17,18,19,20,21,22,27,27,
    1088   16,16,16,16,16,16,17,17,18,19,20,21,22,27,27,28,
    1089   16,16,16,16,16,17,17,18,19,20,21,22,27,27,28,29,
    1090   16,16,16,16,17,17,18,19,20,21,22,27,27,28,29,30,
    1091   16,16,16,17,17,18,19,20,21,22,27,27,28,29,30,32,
    1092   16,16,17,17,18,19,20,21,22,27,27,28,29,30,32,36,
    1093   16,17,17,18,19,20,21,22,27,27,28,29,30,32,36,40,
    1094   17,17,18,19,20,21,22,27,27,28,29,30,32,36,40,45,
    1095   17,18,19,20,21,22,27,27,28,29,30,32,36,40,45,52,
    1096   18,19,20,21,22,27,27,28,29,30,32,36,40,45,52,59,
    1097   19,20,21,22,27,27,28,29,30,32,36,40,45,52,59,68,
    1098   20,21,22,27,27,28,29,30,32,36,40,45,52,59,68,79,
    1099   21,22,27,27,28,29,30,32,36,40,45,52,59,68,79,91,
    1100   22,27,27,28,29,30,32,36,40,45,52,59,68,79,91,103,
    1101   27,27,28,29,30,32,36,40,45,52,59,68,79,91,103,117
    1102 };
    1103 
    1104 Int g_quantIntraDefault32x32[1024] =
    1105 {
    1106   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,27,28,
    1107   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,23,23,24,25,27,28,
    1108   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,20,20,21,22,23,24,25,26,27,28,
    1109   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,21,22,23,24,25,26,27,28,
    1110   16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,20,21,22,23,23,24,25,26,28,29,
    1111   16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,19,20,21,21,22,23,24,25,26,27,28,30,
    1112   16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,19,19,20,20,21,21,22,23,24,25,26,27,28,29,30,
    1113   16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,19,19,20,20,21,21,22,23,24,25,26,27,28,29,30,31,
    1114   16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,19,20,20,21,21,22,22,23,24,25,26,27,28,29,30,31,33,
    1115   16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,20,20,21,22,22,23,23,24,25,26,27,28,29,30,31,33,34,
    1116   16,16,16,16,16,16,16,17,17,18,18,19,19,20,20,21,22,22,23,23,24,25,26,26,27,28,29,30,32,33,34,36,
    1117   16,16,16,16,16,16,17,17,18,18,19,20,20,21,21,22,23,23,24,25,25,26,27,28,29,30,31,32,33,35,36,38,
    1118   16,16,16,16,16,16,17,17,18,19,19,20,21,22,23,23,24,25,25,26,27,28,29,30,31,32,33,34,36,37,39,40,
    1119   16,16,16,16,16,17,17,18,18,19,20,21,22,23,24,24,25,26,27,28,29,30,31,32,33,34,35,37,38,39,41,43,
    1120   16,16,16,16,17,17,17,18,19,20,20,21,23,24,25,26,27,28,29,30,31,32,33,34,35,36,38,39,41,42,44,46,
    1121   16,16,17,17,17,17,18,18,19,20,21,22,23,24,26,27,28,29,31,32,33,34,35,37,38,39,41,42,44,45,47,49,
    1122   17,17,17,17,17,18,18,19,20,20,22,23,24,25,27,28,30,31,32,34,35,36,38,39,41,42,44,45,47,49,51,53,
    1123   17,17,17,17,18,18,19,19,20,21,22,23,25,26,28,29,31,33,34,36,37,39,41,42,44,45,47,49,51,53,55,57,
    1124   17,17,18,18,18,18,19,20,21,22,23,24,25,27,29,31,32,34,36,38,40,42,43,45,47,49,51,53,55,57,60,62,
    1125   18,18,18,18,19,19,20,20,21,22,23,25,26,28,30,32,34,36,38,40,42,44,46,48,51,53,55,57,60,62,65,67,
    1126   18,18,18,19,19,19,20,21,22,23,24,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,65,67,70,73,
    1127   19,19,19,19,20,20,21,21,22,23,25,26,28,30,32,34,36,39,42,44,47,50,52,55,58,61,64,67,70,73,76,79,
    1128   19,19,20,20,20,21,21,22,23,24,26,27,29,31,33,35,38,41,43,46,49,52,56,59,62,65,69,72,75,79,82,86,
    1129   20,20,20,21,21,21,22,23,24,25,26,28,30,32,34,37,39,42,45,48,52,55,59,62,66,70,74,77,81,85,89,93,
    1130   21,21,21,21,22,22,23,24,25,26,27,29,31,33,35,38,41,44,47,51,54,58,62,66,70,74,79,83,88,92,97,101,
    1131   22,22,22,22,23,23,24,25,26,27,28,30,32,34,36,39,42,45,49,53,57,61,65,70,74,79,84,89,94,99,104,110,
    1132   22,23,23,23,23,24,25,26,27,28,29,31,33,35,38,41,44,47,51,55,59,64,69,74,79,84,90,95,101,107,113,119,
    1133   23,23,24,24,24,25,26,27,28,29,30,32,34,37,39,42,45,49,53,57,62,67,72,77,83,89,95,101,108,114,121,128,
    1134   24,24,25,25,25,26,27,28,29,30,32,33,36,38,41,44,47,51,55,60,65,70,75,81,88,94,101,108,115,122,130,138,
    1135   25,25,26,26,26,27,28,29,30,31,33,35,37,39,42,45,49,53,57,62,67,73,79,85,92,99,107,114,122,131,139,148,
    1136   27,27,27,27,28,28,29,30,31,33,34,36,39,41,44,47,51,55,60,65,70,76,82,89,97,104,113,121,130,139,149,159,
    1137   28,28,28,28,29,30,30,31,33,34,36,38,40,43,46,49,53,57,62,67,73,79,86,93,101,110,119,128,138,148,159,170
    1138 };
    1139 
    1140 Int g_quantInterDefault32x32[1024] =
    1141 {
    1142   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,
    1143   16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,
    1144   16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,
    1145   16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,
    1146   16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,
    1147   16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,
    1148   16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,
    1149   16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,
    1150   16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,
    1151   16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,
    1152   16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,
    1153   16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,
    1154   16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,
    1155   16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,
    1156   16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,
    1157   16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,
    1158   17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,
    1159   17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,
    1160   17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,
    1161   18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,
    1162   18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,
    1163   19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,
    1164   19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,
    1165   20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,
    1166   21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,
    1167   22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,
    1168   22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,
    1169   23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,
    1170   24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,
    1171   25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,
    1172   26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,123,
    1173   28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,123,131
    1174 };
    1175 #endif
    1176852UInt g_scalingListSize   [4] = {16,64,256,1024};
    1177853UInt g_scalingListSizeX  [4] = { 4, 8, 16,  32};
    … …  
    1183859std::vector< std::vector<TComWedgeRef> > g_aacWedgeRefLists;
    1184860
    1185 #if HHIQC_DMMFASTSEARCH_B0039
    1186861std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
    1187862std::vector< std::vector< TComWedgeNode> >      g_aacWedgeNodeLists;
    1188 #endif
    1189863
    1190864Void initWedgeLists()
    … …  
    1199873    g_aacWedgeRefLists.push_back( acWedgeRefList );
    1200874
    1201 #if HHIQC_DMMFASTSEARCH_B0039
    1202875    // create WedgeNodeList
    1203876    std::vector<TComWedgeNode> acWedgeNodeList;
    … …  
    1260933    }
    1261934    g_aacWedgeNodeLists.push_back( acWedgeNodeList );
    1262 #endif
     935
    1263936  }
    1264937  return;
    … …  
    1298971      for( Int iL = 0; iL < uiBlockSize; iL++ )
    1299972      {
    1300 #if HHIQC_DMMFASTSEARCH_B0039
    1301973        cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
    1302 #else
    1303         cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes );
    1304 #endif
    1305974        addWedgeletToList( cTempWedgelet, racWedgeList, racWedgeRefList );
    1306975      }
    1307976    }
    1308977  }
    1309 #if HHIQC_DMMFASTSEARCH_B0039
    1310978  UInt uiThrSz = DMM3_SIMPLIFY_TR;
    1311979
    … …  
    1325993  }
    1326994  g_aauiWdgLstM3.push_back(auiWdgListSz);
    1327 #endif
    1328995}
    1329996
    … …  
    13611028  if( bValid )
    13621029  {
    1363 #if HHIQC_DMMFASTSEARCH_B0039
    1364   cWedgelet.findClosetAngle();
    1365 #endif
     1030    cWedgelet.findClosetAngle();
    13661031    racWedgeList.push_back( cWedgelet );
    13671032    TComWedgeRef cWedgeRef;
    … …  
    13701035  }
    13711036}
    1372 #endif
     1037#endif //HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    13731038
    13741039//! \}
Note: See TracChangeset for help on using the changeset viewer.