Changeset 976 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextTables.h


Ignore:
Timestamp:
7 Jul 2014, 17:27:51 (10 years ago)
Author:
tech
Message:
  • Merged 11.1-dev0@975. (Clean ups)
  • Added coding results.
  • Changed version number.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/Lib/TLibCommon/ContextTables.h

    r950 r976  
    110110#define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
    111111#endif
    112 #if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
    113112#define NUM_ANGLE_FLAG_CTX            1
    114 #else
    115 #define NUM_ANGLE_FLAG_CTX            3
    116 #endif
    117113#endif
    118114
    … …  
    372368};
    373369
    374 #if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135
    375370static const UChar
    376371INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
    … …  
    380375  { 155 },
    381376};
    382 #else
    383 static const UChar
    384 INIT_ANGLE_FLAG[3][NUM_ANGLE_FLAG_CTX] =
    385 {
    386   { 154, 155, 156 },
    387   { 141, 185, 214 },
    388   { 155, 170, 157 },
    389 };
    390 #endif
    391377
    392378static const UChar
    … …  
    444430
    445431#if H_3D_DBBP
    446 #if MTK_DBBP_SIGNALING_H0094
    447432static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
    448433{
    … …  
    451436  { 161 },
    452437};
    453 #else
    454 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
    455 {
    456   { CNU },
    457   { CNU },
    458   { CNU },
    459 };
    460 #endif
    461 #endif
    462 
    463 #endif
     438#endif
     439
     440#endif
Note: See TracChangeset for help on using the changeset viewer.