|
|
|
@ -457,61 +457,45 @@ static const uint8_t div6[52]={ |
|
|
|
|
0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static const uint16_t dequant_coeff[52][16]={ |
|
|
|
|
{ 10, 13, 10, 13, 13, 16, 13, 16, 10, 13, 10, 13, 13, 16, 13, 16, }, |
|
|
|
|
{ 11, 14, 11, 14, 14, 18, 14, 18, 11, 14, 11, 14, 14, 18, 14, 18, }, |
|
|
|
|
{ 13, 16, 13, 16, 16, 20, 16, 20, 13, 16, 13, 16, 16, 20, 16, 20, }, |
|
|
|
|
{ 14, 18, 14, 18, 18, 23, 18, 23, 14, 18, 14, 18, 18, 23, 18, 23, }, |
|
|
|
|
{ 16, 20, 16, 20, 20, 25, 20, 25, 16, 20, 16, 20, 20, 25, 20, 25, }, |
|
|
|
|
{ 18, 23, 18, 23, 23, 29, 23, 29, 18, 23, 18, 23, 23, 29, 23, 29, }, |
|
|
|
|
{ 20, 26, 20, 26, 26, 32, 26, 32, 20, 26, 20, 26, 26, 32, 26, 32, }, |
|
|
|
|
{ 22, 28, 22, 28, 28, 36, 28, 36, 22, 28, 22, 28, 28, 36, 28, 36, }, |
|
|
|
|
{ 26, 32, 26, 32, 32, 40, 32, 40, 26, 32, 26, 32, 32, 40, 32, 40, }, |
|
|
|
|
{ 28, 36, 28, 36, 36, 46, 36, 46, 28, 36, 28, 36, 36, 46, 36, 46, }, |
|
|
|
|
{ 32, 40, 32, 40, 40, 50, 40, 50, 32, 40, 32, 40, 40, 50, 40, 50, }, |
|
|
|
|
{ 36, 46, 36, 46, 46, 58, 46, 58, 36, 46, 36, 46, 46, 58, 46, 58, }, |
|
|
|
|
{ 40, 52, 40, 52, 52, 64, 52, 64, 40, 52, 40, 52, 52, 64, 52, 64, }, |
|
|
|
|
{ 44, 56, 44, 56, 56, 72, 56, 72, 44, 56, 44, 56, 56, 72, 56, 72, }, |
|
|
|
|
{ 52, 64, 52, 64, 64, 80, 64, 80, 52, 64, 52, 64, 64, 80, 64, 80, }, |
|
|
|
|
{ 56, 72, 56, 72, 72, 92, 72, 92, 56, 72, 56, 72, 72, 92, 72, 92, }, |
|
|
|
|
{ 64, 80, 64, 80, 80, 100, 80, 100, 64, 80, 64, 80, 80, 100, 80, 100, }, |
|
|
|
|
{ 72, 92, 72, 92, 92, 116, 92, 116, 72, 92, 72, 92, 92, 116, 92, 116, }, |
|
|
|
|
{ 80, 104, 80, 104, 104, 128, 104, 128, 80, 104, 80, 104, 104, 128, 104, 128, }, |
|
|
|
|
{ 88, 112, 88, 112, 112, 144, 112, 144, 88, 112, 88, 112, 112, 144, 112, 144, }, |
|
|
|
|
{ 104, 128, 104, 128, 128, 160, 128, 160, 104, 128, 104, 128, 128, 160, 128, 160, }, |
|
|
|
|
{ 112, 144, 112, 144, 144, 184, 144, 184, 112, 144, 112, 144, 144, 184, 144, 184, }, |
|
|
|
|
{ 128, 160, 128, 160, 160, 200, 160, 200, 128, 160, 128, 160, 160, 200, 160, 200, }, |
|
|
|
|
{ 144, 184, 144, 184, 184, 232, 184, 232, 144, 184, 144, 184, 184, 232, 184, 232, }, |
|
|
|
|
{ 160, 208, 160, 208, 208, 256, 208, 256, 160, 208, 160, 208, 208, 256, 208, 256, }, |
|
|
|
|
{ 176, 224, 176, 224, 224, 288, 224, 288, 176, 224, 176, 224, 224, 288, 224, 288, }, |
|
|
|
|
{ 208, 256, 208, 256, 256, 320, 256, 320, 208, 256, 208, 256, 256, 320, 256, 320, }, |
|
|
|
|
{ 224, 288, 224, 288, 288, 368, 288, 368, 224, 288, 224, 288, 288, 368, 288, 368, }, |
|
|
|
|
{ 256, 320, 256, 320, 320, 400, 320, 400, 256, 320, 256, 320, 320, 400, 320, 400, }, |
|
|
|
|
{ 288, 368, 288, 368, 368, 464, 368, 464, 288, 368, 288, 368, 368, 464, 368, 464, }, |
|
|
|
|
{ 320, 416, 320, 416, 416, 512, 416, 512, 320, 416, 320, 416, 416, 512, 416, 512, }, |
|
|
|
|
{ 352, 448, 352, 448, 448, 576, 448, 576, 352, 448, 352, 448, 448, 576, 448, 576, }, |
|
|
|
|
{ 416, 512, 416, 512, 512, 640, 512, 640, 416, 512, 416, 512, 512, 640, 512, 640, }, |
|
|
|
|
{ 448, 576, 448, 576, 576, 736, 576, 736, 448, 576, 448, 576, 576, 736, 576, 736, }, |
|
|
|
|
{ 512, 640, 512, 640, 640, 800, 640, 800, 512, 640, 512, 640, 640, 800, 640, 800, }, |
|
|
|
|
{ 576, 736, 576, 736, 736, 928, 736, 928, 576, 736, 576, 736, 736, 928, 736, 928, }, |
|
|
|
|
{ 640, 832, 640, 832, 832,1024, 832,1024, 640, 832, 640, 832, 832,1024, 832,1024, }, |
|
|
|
|
{ 704, 896, 704, 896, 896,1152, 896,1152, 704, 896, 704, 896, 896,1152, 896,1152, }, |
|
|
|
|
{ 832,1024, 832,1024, 1024,1280,1024,1280, 832,1024, 832,1024, 1024,1280,1024,1280, }, |
|
|
|
|
{ 896,1152, 896,1152, 1152,1472,1152,1472, 896,1152, 896,1152, 1152,1472,1152,1472, }, |
|
|
|
|
{1024,1280,1024,1280, 1280,1600,1280,1600, 1024,1280,1024,1280, 1280,1600,1280,1600, }, |
|
|
|
|
{1152,1472,1152,1472, 1472,1856,1472,1856, 1152,1472,1152,1472, 1472,1856,1472,1856, }, |
|
|
|
|
{1280,1664,1280,1664, 1664,2048,1664,2048, 1280,1664,1280,1664, 1664,2048,1664,2048, }, |
|
|
|
|
{1408,1792,1408,1792, 1792,2304,1792,2304, 1408,1792,1408,1792, 1792,2304,1792,2304, }, |
|
|
|
|
{1664,2048,1664,2048, 2048,2560,2048,2560, 1664,2048,1664,2048, 2048,2560,2048,2560, }, |
|
|
|
|
{1792,2304,1792,2304, 2304,2944,2304,2944, 1792,2304,1792,2304, 2304,2944,2304,2944, }, |
|
|
|
|
{2048,2560,2048,2560, 2560,3200,2560,3200, 2048,2560,2048,2560, 2560,3200,2560,3200, }, |
|
|
|
|
{2304,2944,2304,2944, 2944,3712,2944,3712, 2304,2944,2304,2944, 2944,3712,2944,3712, }, |
|
|
|
|
{2560,3328,2560,3328, 3328,4096,3328,4096, 2560,3328,2560,3328, 3328,4096,3328,4096, }, |
|
|
|
|
{2816,3584,2816,3584, 3584,4608,3584,4608, 2816,3584,2816,3584, 3584,4608,3584,4608, }, |
|
|
|
|
{3328,4096,3328,4096, 4096,5120,4096,5120, 3328,4096,3328,4096, 4096,5120,4096,5120, }, |
|
|
|
|
{3584,4608,3584,4608, 4608,5888,4608,5888, 3584,4608,3584,4608, 4608,5888,4608,5888, }, |
|
|
|
|
//{4096,5120,4096,5120, 5120,6400,5120,6400, 4096,5120,4096,5120, 5120,6400,5120,6400, },
|
|
|
|
|
//{4608,5888,4608,5888, 5888,7424,5888,7424, 4608,5888,4608,5888, 5888,7424,5888,7424, },
|
|
|
|
|
static const uint8_t default_scaling4[2][16]={ |
|
|
|
|
{ 6,13,20,28, |
|
|
|
|
13,20,28,32, |
|
|
|
|
20,28,32,37, |
|
|
|
|
28,32,37,42 |
|
|
|
|
},{ |
|
|
|
|
10,14,20,24, |
|
|
|
|
14,20,24,27, |
|
|
|
|
20,24,27,30, |
|
|
|
|
24,27,30,34 |
|
|
|
|
}}; |
|
|
|
|
|
|
|
|
|
static const uint8_t default_scaling8[2][64]={ |
|
|
|
|
{ 6,10,13,16,18,23,25,27, |
|
|
|
|
10,11,16,18,23,25,27,29, |
|
|
|
|
13,16,18,23,25,27,29,31, |
|
|
|
|
16,18,23,25,27,29,31,33, |
|
|
|
|
18,23,25,27,29,31,33,36, |
|
|
|
|
23,25,27,29,31,33,36,38, |
|
|
|
|
25,27,29,31,33,36,38,40, |
|
|
|
|
27,29,31,33,36,38,40,42 |
|
|
|
|
},{ |
|
|
|
|
9,13,15,17,19,21,22,24, |
|
|
|
|
13,13,17,19,21,22,24,25, |
|
|
|
|
15,17,19,21,22,24,25,27, |
|
|
|
|
17,19,21,22,24,25,27,28, |
|
|
|
|
19,21,22,24,25,27,28,30, |
|
|
|
|
21,22,24,25,27,28,30,32, |
|
|
|
|
22,24,25,27,28,30,32,33, |
|
|
|
|
24,25,27,28,30,32,33,35 |
|
|
|
|
}}; |
|
|
|
|
|
|
|
|
|
static const int dequant4_coeff_init[6][3]={ |
|
|
|
|
{10,13,16}, |
|
|
|
|
{11,14,18}, |
|
|
|
|
{13,16,20}, |
|
|
|
|
{14,18,23}, |
|
|
|
|
{16,20,25}, |
|
|
|
|
{18,23,29}, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static const int dequant8_coeff_init_scan[16] = { |
|
|
|
|