tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: verisilicon : Use exported tables from v4l2-jpeg for hantro codec
Use v4l2-jpeg core API to import reference quantization and huffman tables
used for JPEG Encoding.
Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
authored by
Devarsh Thakkar
and committed by
Hans Verkuil
e1bda64a
ceb9a33b
+14
-116
+1
drivers/media/platform/verisilicon/Kconfig
+1
drivers/media/platform/verisilicon/Kconfig
+13
-116
drivers/media/platform/verisilicon/hantro_jpeg.c
+13
-116
drivers/media/platform/verisilicon/hantro_jpeg.c
···
11
11
#include <linux/build_bug.h>
12
12
#include <linux/kernel.h>
13
13
#include <linux/string.h>
14
+
#include <media/v4l2-jpeg.h>
14
15
#include "hantro_jpeg.h"
15
16
#include "hantro.h"
16
17
···
25
24
#define HUFF_CHROMA_DC_OFF 394
26
25
#define HUFF_CHROMA_AC_OFF 427
27
26
28
-
/* Default tables from JPEG ITU-T.81
29
-
* (ISO/IEC 10918-1) Annex K, tables K.1 and K.2
30
-
*/
31
-
static const unsigned char luma_q_table[] = {
32
-
0x10, 0x0b, 0x0a, 0x10, 0x18, 0x28, 0x33, 0x3d,
33
-
0x0c, 0x0c, 0x0e, 0x13, 0x1a, 0x3a, 0x3c, 0x37,
34
-
0x0e, 0x0d, 0x10, 0x18, 0x28, 0x39, 0x45, 0x38,
35
-
0x0e, 0x11, 0x16, 0x1d, 0x33, 0x57, 0x50, 0x3e,
36
-
0x12, 0x16, 0x25, 0x38, 0x44, 0x6d, 0x67, 0x4d,
37
-
0x18, 0x23, 0x37, 0x40, 0x51, 0x68, 0x71, 0x5c,
38
-
0x31, 0x40, 0x4e, 0x57, 0x67, 0x79, 0x78, 0x65,
39
-
0x48, 0x5c, 0x5f, 0x62, 0x70, 0x64, 0x67, 0x63
40
-
};
41
-
42
-
static const unsigned char chroma_q_table[] = {
43
-
0x11, 0x12, 0x18, 0x2f, 0x63, 0x63, 0x63, 0x63,
44
-
0x12, 0x15, 0x1a, 0x42, 0x63, 0x63, 0x63, 0x63,
45
-
0x18, 0x1a, 0x38, 0x63, 0x63, 0x63, 0x63, 0x63,
46
-
0x2f, 0x42, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
47
-
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
48
-
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
49
-
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
50
-
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63
51
-
};
52
-
53
-
static const unsigned char zigzag[] = {
54
-
0, 1, 8, 16, 9, 2, 3, 10,
55
-
17, 24, 32, 25, 18, 11, 4, 5,
56
-
12, 19, 26, 33, 40, 48, 41, 34,
57
-
27, 20, 13, 6, 7, 14, 21, 28,
58
-
35, 42, 49, 56, 57, 50, 43, 36,
59
-
29, 22, 15, 23, 30, 37, 44, 51,
60
-
58, 59, 52, 45, 38, 31, 39, 46,
61
-
53, 60, 61, 54, 47, 55, 62, 63
62
-
};
63
-
64
27
static const u32 hw_reorder[] = {
65
28
0, 8, 16, 24, 1, 9, 17, 25,
66
29
32, 40, 48, 56, 33, 41, 49, 57,
···
34
69
36, 44, 52, 60, 37, 45, 53, 61,
35
70
6, 14, 22, 30, 7, 15, 23, 31,
36
71
38, 46, 54, 62, 39, 47, 55, 63
37
-
};
38
-
39
-
/* Huffman tables are shared with CODA */
40
-
static const unsigned char luma_dc_table[] = {
41
-
0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
42
-
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
43
-
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
44
-
0x08, 0x09, 0x0a, 0x0b,
45
-
};
46
-
47
-
static const unsigned char chroma_dc_table[] = {
48
-
0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
49
-
0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
50
-
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
51
-
0x08, 0x09, 0x0a, 0x0b,
52
-
};
53
-
54
-
static const unsigned char luma_ac_table[] = {
55
-
0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
56
-
0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
57
-
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
58
-
0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
59
-
0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
60
-
0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
61
-
0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
62
-
0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
63
-
0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
64
-
0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
65
-
0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
66
-
0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
67
-
0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
68
-
0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
69
-
0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
70
-
0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
71
-
0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
72
-
0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
73
-
0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
74
-
0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
75
-
0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
76
-
0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
77
-
0xf9, 0xfa,
78
-
};
79
-
80
-
static const unsigned char chroma_ac_table[] = {
81
-
0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
82
-
0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
83
-
0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
84
-
0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
85
-
0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
86
-
0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
87
-
0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
88
-
0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
89
-
0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
90
-
0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
91
-
0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
92
-
0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
93
-
0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
94
-
0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
95
-
0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
96
-
0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
97
-
0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
98
-
0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
99
-
0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
100
-
0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
101
-
0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
102
-
0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
103
-
0xf9, 0xfa,
104
72
};
105
73
106
74
/* For simplicity, we keep a pre-formatted JPEG header,
···
190
292
{
191
293
int i;
192
294
193
-
BUILD_BUG_ON(ARRAY_SIZE(zigzag) != JPEG_QUANT_SIZE);
295
+
BUILD_BUG_ON(ARRAY_SIZE(v4l2_jpeg_zigzag_scan_index) != JPEG_QUANT_SIZE);
194
296
BUILD_BUG_ON(ARRAY_SIZE(hw_reorder) != JPEG_QUANT_SIZE);
195
297
196
298
for (i = 0; i < JPEG_QUANT_SIZE; i++) {
197
-
file_q_tab[i] = jpeg_scale_qp(tab[zigzag[i]], scale);
299
+
file_q_tab[i] = jpeg_scale_qp(tab[v4l2_jpeg_zigzag_scan_index[i]], scale);
198
300
reordered_q_tab[i] = jpeg_scale_qp(tab[hw_reorder[i]], scale);
199
301
}
200
302
}
···
202
304
static void jpeg_set_quality(struct hantro_jpeg_ctx *ctx)
203
305
{
204
306
int scale;
205
-
206
307
/*
207
308
* Non-linear scaling factor:
208
309
* [5,50] -> [1000..100], [51,100] -> [98..0]
···
211
314
else
212
315
scale = 200 - 2 * ctx->quality;
213
316
214
-
BUILD_BUG_ON(ARRAY_SIZE(luma_q_table) != JPEG_QUANT_SIZE);
215
-
BUILD_BUG_ON(ARRAY_SIZE(chroma_q_table) != JPEG_QUANT_SIZE);
317
+
BUILD_BUG_ON(ARRAY_SIZE(v4l2_jpeg_ref_table_luma_qt) != JPEG_QUANT_SIZE);
318
+
BUILD_BUG_ON(ARRAY_SIZE(v4l2_jpeg_ref_table_chroma_qt) != JPEG_QUANT_SIZE);
216
319
BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_luma_qtable) != JPEG_QUANT_SIZE);
217
320
BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_chroma_qtable) != JPEG_QUANT_SIZE);
218
321
219
322
jpeg_scale_quant_table(ctx->buffer + LUMA_QUANT_OFF,
220
-
ctx->hw_luma_qtable, luma_q_table, scale);
323
+
ctx->hw_luma_qtable,
324
+
(const unsigned char *)v4l2_jpeg_ref_table_luma_qt, scale);
221
325
jpeg_scale_quant_table(ctx->buffer + CHROMA_QUANT_OFF,
222
-
ctx->hw_chroma_qtable, chroma_q_table, scale);
326
+
ctx->hw_chroma_qtable,
327
+
(const unsigned char *)v4l2_jpeg_ref_table_chroma_qt, scale);
223
328
}
224
329
225
330
void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
···
236
337
buf[WIDTH_OFF + 0] = ctx->width >> 8;
237
338
buf[WIDTH_OFF + 1] = ctx->width;
238
339
239
-
memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, sizeof(luma_dc_table));
240
-
memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, sizeof(luma_ac_table));
241
-
memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table,
242
-
sizeof(chroma_dc_table));
243
-
memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table,
244
-
sizeof(chroma_ac_table));
340
+
memcpy(buf + HUFF_LUMA_DC_OFF, v4l2_jpeg_ref_table_luma_dc_ht, V4L2_JPEG_REF_HT_DC_LEN);
341
+
memcpy(buf + HUFF_LUMA_AC_OFF, v4l2_jpeg_ref_table_luma_ac_ht, V4L2_JPEG_REF_HT_AC_LEN);
342
+
memcpy(buf + HUFF_CHROMA_DC_OFF, v4l2_jpeg_ref_table_chroma_dc_ht, V4L2_JPEG_REF_HT_DC_LEN);
343
+
memcpy(buf + HUFF_CHROMA_AC_OFF, v4l2_jpeg_ref_table_chroma_ac_ht, V4L2_JPEG_REF_HT_AC_LEN);
245
344
246
345
jpeg_set_quality(ctx);
247
346
}