* [PATCH RESEND v7 4/8] media: imagination: Use exported tables from v4l2-jpeg core
[not found] <20240510082603.1263256-1>
@ 2024-05-10 8:34 ` Devarsh Thakkar
2024-05-10 8:35 ` [PATCH RESEND v7 5/8] media: verisilcon : Use exported tables from v4l2-jpeg for hantro codec Devarsh Thakkar
1 sibling, 0 replies; 3+ messages in thread
From: Devarsh Thakkar @ 2024-05-10 8:34 UTC (permalink / raw)
To: mchehab, hverkuil-cisco, linux-media, linux-kernel,
benjamin.gaignard, sebastian.fricke
Cc: laurent.pinchart, praneeth, nm, vigneshr, a-bhatia1, j-luthra,
b-brnich, detheridge, p-mantena, vijayp, devarsht, andrzej.p,
nicolas, ezequiel, p.zabel, linux-rockchip
Use exported huffman and quantization tables from v4l2-jpeg core library.
Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
---
V1->V6 (No change, patch introduced in V7)
---
.../platform/imagination/e5010-jpeg-enc.c | 140 +++---------------
1 file changed, 19 insertions(+), 121 deletions(-)
diff --git a/drivers/media/platform/imagination/e5010-jpeg-enc.c b/drivers/media/platform/imagination/e5010-jpeg-enc.c
index 5606d9c90d80..189e2a99c43d 100644
--- a/drivers/media/platform/imagination/e5010-jpeg-enc.c
+++ b/drivers/media/platform/imagination/e5010-jpeg-enc.c
@@ -32,116 +32,6 @@
#include "e5010-jpeg-enc.h"
#include "e5010-jpeg-enc-hw.h"
-/* Luma and chroma qp table to achieve 50% compression quality
- * This is as per example in Annex K.1 of ITU-T.81
- */
-static const u8 luma_q_table[64] = {
- 16, 11, 10, 16, 24, 40, 51, 61,
- 12, 12, 14, 19, 26, 58, 60, 55,
- 14, 13, 16, 24, 40, 57, 69, 56,
- 14, 17, 22, 29, 51, 87, 80, 62,
- 18, 22, 37, 56, 68, 109, 103, 77,
- 24, 35, 55, 64, 81, 104, 113, 92,
- 49, 64, 78, 87, 103, 121, 120, 101,
- 72, 92, 95, 98, 112, 100, 103, 99
-};
-
-static const u8 chroma_q_table[64] = {
- 17, 18, 24, 47, 99, 99, 99, 99,
- 18, 21, 26, 66, 99, 99, 99, 99,
- 24, 26, 56, 99, 99, 99, 99, 99,
- 47, 66, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99,
- 99, 99, 99, 99, 99, 99, 99, 99
-};
-
-/* Zigzag scan pattern */
-static const u8 zigzag[64] = {
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-};
-
-/*
- * Contains the data that needs to be sent in the marker segment of an interchange format JPEG
- * stream or an abbreviated format table specification data stream.
- * Specifies the huffman table used for encoding the luminance DC coefficient differences.
- * The table represents Table K.3 of ITU-T.81
- */
-static const u8 luma_dc_table[] = {
- 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
- 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B
-};
-
-/*
- * Contains the data that needs to be sent in the marker segment of an interchange format JPEG
- * stream or an abbreviated format table specification data stream.
- * Specifies the huffman table used for encoding the luminance AC coefficients.
- * The table represents Table K.5 of ITU-T.81
- */
-static const u8 luma_ac_table[] = {
- 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
- 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D,
- 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61,
- 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52,
- 0xD1, 0xF0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25,
- 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45,
- 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64,
- 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83,
- 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
- 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
- 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3,
- 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8,
- 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA
-};
-
-/*
- * Contains the data that needs to be sent in the marker segment of an interchange format JPEG
- * stream or an abbreviated format table specification data stream.
- * Specifies the huffman table used for encoding the chrominance DC coefficient differences.
- * The table represents Table K.4 of ITU-T.81
- */
-static const u8 chroma_dc_table[] = {
- 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B
-};
-
-/*
- * Contains the data that needs to be sent in the marker segment of an interchange format JPEG
- * stream or an abbreviated format table specification data stream.
- * Specifies the huffman table used for encoding the chrominance AC coefficients.
- * The table represents Table K.6 of ITU-T.81
- */
-static const u8 chroma_ac_table[] = {
- 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
- 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
- 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61,
- 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33,
- 0x52, 0xF0, 0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18,
- 0x19, 0x1A, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44,
- 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63,
- 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A,
- 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
- 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4,
- 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA,
- 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
- 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA
-};
-
-#define JPEG_LUM_HT 0x00
-#define JPEG_CHR_HT 0x01
-#define JPEG_DC_HT 0x00
-#define JPEG_AC_HT 0x10
-
/* forward declarations */
static const struct of_device_id e5010_of_match[];
@@ -270,6 +160,9 @@ static void calculate_qp_tables(struct e5010_context *ctx)
{
long long luminosity, contrast;
int quality, i;
+ const u8 *luma_q_table, *chroma_q_table;
+
+ v4l2_jpeg_get_reference_quantization_tables(&luma_q_table, &chroma_q_table);
quality = 50 - ctx->quality;
@@ -281,7 +174,7 @@ static void calculate_qp_tables(struct e5010_context *ctx)
contrast *= INCREASE;
}
- for (i = 0; i < ARRAY_SIZE(luma_q_table); i++) {
+ for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++) {
long long delta = chroma_q_table[i] * contrast + luminosity;
int val = (int)(chroma_q_table[i] + delta);
@@ -927,41 +820,46 @@ static void encode_marker_segment(struct e5010_context *ctx, void *addr, unsigne
{
u8 *buffer = (u8 *)addr;
int i;
+ const u8 *luma_dc_table, *chroma_dc_table, *luma_ac_table, *chroma_ac_table, *zigzag;
+
+ v4l2_jpeg_get_reference_huffman_tables(&luma_dc_table, &luma_ac_table, &chroma_dc_table,
+ &chroma_ac_table);
+ v4l2_jpeg_get_zig_zag_scan(&zigzag);
header_write(ctx, buffer, offset, 2, START_OF_IMAGE);
header_write(ctx, buffer, offset, 2, DQT_MARKER);
header_write(ctx, buffer, offset, 3, LQPQ << 4);
- for (i = 0; i < PELS_IN_BLOCK; i++)
+ for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++)
header_write(ctx, buffer, offset, 1, ctx->luma_qp[zigzag[i]]);
header_write(ctx, buffer, offset, 2, DQT_MARKER);
header_write(ctx, buffer, offset, 3, (LQPQ << 4) | 1);
- for (i = 0; i < PELS_IN_BLOCK; i++)
+ for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++)
header_write(ctx, buffer, offset, 1, ctx->chroma_qp[zigzag[i]]);
/* Huffman tables */
header_write(ctx, buffer, offset, 2, DHT_MARKER);
header_write(ctx, buffer, offset, 2, LH_DC);
- header_write(ctx, buffer, offset, 1, JPEG_LUM_HT | JPEG_DC_HT);
- for (i = 0 ; i < ARRAY_SIZE(luma_dc_table); i++)
+ header_write(ctx, buffer, offset, 1, V4L2_JPEG_LUM_HT | V4L2_JPEG_DC_HT);
+ for (i = 0 ; i < V4L2_JPEG_REF_HT_DC_LEN; i++)
header_write(ctx, buffer, offset, 1, luma_dc_table[i]);
header_write(ctx, buffer, offset, 2, DHT_MARKER);
header_write(ctx, buffer, offset, 2, LH_AC);
- header_write(ctx, buffer, offset, 1, JPEG_LUM_HT | JPEG_AC_HT);
- for (i = 0 ; i < ARRAY_SIZE(luma_ac_table); i++)
+ header_write(ctx, buffer, offset, 1, V4L2_JPEG_LUM_HT | V4L2_JPEG_AC_HT);
+ for (i = 0 ; i < V4L2_JPEG_REF_HT_AC_LEN; i++)
header_write(ctx, buffer, offset, 1, luma_ac_table[i]);
header_write(ctx, buffer, offset, 2, DHT_MARKER);
header_write(ctx, buffer, offset, 2, LH_DC);
- header_write(ctx, buffer, offset, 1, JPEG_CHR_HT | JPEG_DC_HT);
- for (i = 0 ; i < ARRAY_SIZE(chroma_dc_table); i++)
+ header_write(ctx, buffer, offset, 1, V4L2_JPEG_CHR_HT | V4L2_JPEG_DC_HT);
+ for (i = 0 ; i < V4L2_JPEG_REF_HT_DC_LEN; i++)
header_write(ctx, buffer, offset, 1, chroma_dc_table[i]);
header_write(ctx, buffer, offset, 2, DHT_MARKER);
header_write(ctx, buffer, offset, 2, LH_AC);
- header_write(ctx, buffer, offset, 1, JPEG_CHR_HT | JPEG_AC_HT);
- for (i = 0 ; i < ARRAY_SIZE(chroma_ac_table); i++)
+ header_write(ctx, buffer, offset, 1, V4L2_JPEG_CHR_HT | V4L2_JPEG_AC_HT);
+ for (i = 0 ; i < V4L2_JPEG_REF_HT_AC_LEN; i++)
header_write(ctx, buffer, offset, 1, chroma_ac_table[i]);
}
--
2.39.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH RESEND v7 5/8] media: verisilcon : Use exported tables from v4l2-jpeg for hantro codec
[not found] <20240510082603.1263256-1>
2024-05-10 8:34 ` [PATCH RESEND v7 4/8] media: imagination: Use exported tables from v4l2-jpeg core Devarsh Thakkar
@ 2024-05-10 8:35 ` Devarsh Thakkar
2024-05-10 8:50 ` Chen-Yu Tsai
1 sibling, 1 reply; 3+ messages in thread
From: Devarsh Thakkar @ 2024-05-10 8:35 UTC (permalink / raw)
To: mchehab, hverkuil-cisco, linux-media, linux-kernel,
benjamin.gaignard, sebastian.fricke, ezequiel, p.zabel,
linux-rockchip
Cc: laurent.pinchart, praneeth, nm, vigneshr, a-bhatia1, j-luthra,
b-brnich, detheridge, p-mantena, vijayp, devarsht, andrzej.p,
nicolas
Use v4l2-jpeg core API to import reference quantization and huffman tables
used for JPEG Encoding.
Signed-off-by: Devarsh Thakkar <devarsht@ti.com>
---
V1->V6 (No change, patch introduced in V7)
---
.../media/platform/verisilicon/hantro_jpeg.c | 128 ++----------------
1 file changed, 14 insertions(+), 114 deletions(-)
diff --git a/drivers/media/platform/verisilicon/hantro_jpeg.c b/drivers/media/platform/verisilicon/hantro_jpeg.c
index d07b1b449b61..fa4e8ee92c05 100644
--- a/drivers/media/platform/verisilicon/hantro_jpeg.c
+++ b/drivers/media/platform/verisilicon/hantro_jpeg.c
@@ -11,6 +11,7 @@
#include <linux/build_bug.h>
#include <linux/kernel.h>
#include <linux/string.h>
+#include <media/v4l2-jpeg.h>
#include "hantro_jpeg.h"
#include "hantro.h"
@@ -24,42 +25,6 @@
#define HUFF_CHROMA_DC_OFF 394
#define HUFF_CHROMA_AC_OFF 427
-/* Default tables from JPEG ITU-T.81
- * (ISO/IEC 10918-1) Annex K, tables K.1 and K.2
- */
-static const unsigned char luma_q_table[] = {
- 0x10, 0x0b, 0x0a, 0x10, 0x18, 0x28, 0x33, 0x3d,
- 0x0c, 0x0c, 0x0e, 0x13, 0x1a, 0x3a, 0x3c, 0x37,
- 0x0e, 0x0d, 0x10, 0x18, 0x28, 0x39, 0x45, 0x38,
- 0x0e, 0x11, 0x16, 0x1d, 0x33, 0x57, 0x50, 0x3e,
- 0x12, 0x16, 0x25, 0x38, 0x44, 0x6d, 0x67, 0x4d,
- 0x18, 0x23, 0x37, 0x40, 0x51, 0x68, 0x71, 0x5c,
- 0x31, 0x40, 0x4e, 0x57, 0x67, 0x79, 0x78, 0x65,
- 0x48, 0x5c, 0x5f, 0x62, 0x70, 0x64, 0x67, 0x63
-};
-
-static const unsigned char chroma_q_table[] = {
- 0x11, 0x12, 0x18, 0x2f, 0x63, 0x63, 0x63, 0x63,
- 0x12, 0x15, 0x1a, 0x42, 0x63, 0x63, 0x63, 0x63,
- 0x18, 0x1a, 0x38, 0x63, 0x63, 0x63, 0x63, 0x63,
- 0x2f, 0x42, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
- 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
- 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
- 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
- 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63
-};
-
-static const unsigned char zigzag[] = {
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-};
-
static const u32 hw_reorder[] = {
0, 8, 16, 24, 1, 9, 17, 25,
32, 40, 48, 56, 33, 41, 49, 57,
@@ -71,73 +36,6 @@ static const u32 hw_reorder[] = {
38, 46, 54, 62, 39, 47, 55, 63
};
-/* Huffman tables are shared with CODA */
-static const unsigned char luma_dc_table[] = {
- 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
- 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0a, 0x0b,
-};
-
-static const unsigned char chroma_dc_table[] = {
- 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0a, 0x0b,
-};
-
-static const unsigned char luma_ac_table[] = {
- 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
- 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
- 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
- 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
- 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
- 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
- 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
- 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
- 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
- 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
- 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
- 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
- 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
- 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
- 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
- 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
- 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
- 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
- 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
- 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
- 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
- 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
- 0xf9, 0xfa,
-};
-
-static const unsigned char chroma_ac_table[] = {
- 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
- 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
- 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
- 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
- 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
- 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
- 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
- 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
- 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
- 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
- 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
- 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
- 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
- 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
- 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
- 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
- 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
- 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
- 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
- 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
- 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
- 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
- 0xf9, 0xfa,
-};
-
/* For simplicity, we keep a pre-formatted JPEG header,
* and we'll use fixed offsets to change the width, height
* quantization tables, etc.
@@ -291,10 +189,11 @@ jpeg_scale_quant_table(unsigned char *file_q_tab,
const unsigned char *tab, int scale)
{
int i;
+ const u8 *zigzag;
- BUILD_BUG_ON(ARRAY_SIZE(zigzag) != JPEG_QUANT_SIZE);
BUILD_BUG_ON(ARRAY_SIZE(hw_reorder) != JPEG_QUANT_SIZE);
+ v4l2_jpeg_get_zig_zag_scan(&zigzag);
for (i = 0; i < JPEG_QUANT_SIZE; i++) {
file_q_tab[i] = jpeg_scale_qp(tab[zigzag[i]], scale);
reordered_q_tab[i] = jpeg_scale_qp(tab[hw_reorder[i]], scale);
@@ -304,6 +203,7 @@ jpeg_scale_quant_table(unsigned char *file_q_tab,
static void jpeg_set_quality(struct hantro_jpeg_ctx *ctx)
{
int scale;
+ const u8 *luma_q_table, *chroma_q_table;
/*
* Non-linear scaling factor:
@@ -314,21 +214,23 @@ static void jpeg_set_quality(struct hantro_jpeg_ctx *ctx)
else
scale = 200 - 2 * ctx->quality;
- BUILD_BUG_ON(ARRAY_SIZE(luma_q_table) != JPEG_QUANT_SIZE);
- BUILD_BUG_ON(ARRAY_SIZE(chroma_q_table) != JPEG_QUANT_SIZE);
BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_luma_qtable) != JPEG_QUANT_SIZE);
BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_chroma_qtable) != JPEG_QUANT_SIZE);
+ v4l2_jpeg_get_reference_quantization_tables(&luma_q_table, &chroma_q_table);
jpeg_scale_quant_table(ctx->buffer + LUMA_QUANT_OFF,
- ctx->hw_luma_qtable, luma_q_table, scale);
+ ctx->hw_luma_qtable, (const unsigned char *)luma_q_table, scale);
jpeg_scale_quant_table(ctx->buffer + CHROMA_QUANT_OFF,
- ctx->hw_chroma_qtable, chroma_q_table, scale);
+ ctx->hw_chroma_qtable, (const unsigned char *)chroma_q_table, scale);
}
void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
{
char *buf = ctx->buffer;
+ const u8 *luma_dc_table, *chroma_dc_table, *luma_ac_table, *chroma_ac_table;
+ v4l2_jpeg_get_reference_huffman_tables(&luma_dc_table, &luma_ac_table, &chroma_dc_table,
+ &chroma_ac_table);
memcpy(buf, hantro_jpeg_header,
sizeof(hantro_jpeg_header));
@@ -337,12 +239,10 @@ void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
buf[WIDTH_OFF + 0] = ctx->width >> 8;
buf[WIDTH_OFF + 1] = ctx->width;
- memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, sizeof(luma_dc_table));
- memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, sizeof(luma_ac_table));
- memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table,
- sizeof(chroma_dc_table));
- memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table,
- sizeof(chroma_ac_table));
+ memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, V4L2_JPEG_REF_HT_DC_LEN);
+ memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, V4L2_JPEG_REF_HT_AC_LEN);
+ memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table, V4L2_JPEG_REF_HT_DC_LEN);
+ memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table, V4L2_JPEG_REF_HT_AC_LEN);
jpeg_set_quality(ctx);
}
--
2.39.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND v7 5/8] media: verisilcon : Use exported tables from v4l2-jpeg for hantro codec
2024-05-10 8:35 ` [PATCH RESEND v7 5/8] media: verisilcon : Use exported tables from v4l2-jpeg for hantro codec Devarsh Thakkar
@ 2024-05-10 8:50 ` Chen-Yu Tsai
0 siblings, 0 replies; 3+ messages in thread
From: Chen-Yu Tsai @ 2024-05-10 8:50 UTC (permalink / raw)
To: Devarsh Thakkar
Cc: mchehab, hverkuil-cisco, linux-media, linux-kernel,
benjamin.gaignard, sebastian.fricke, ezequiel, p.zabel,
linux-rockchip, laurent.pinchart, praneeth, nm, vigneshr,
a-bhatia1, j-luthra, b-brnich, detheridge, p-mantena, vijayp,
andrzej.p, nicolas
On Fri, May 10, 2024 at 4:36 PM Devarsh Thakkar <devarsht@ti.com> wrote:
>
> 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>
Code looks OK. This was probably very overdue.
> ---
> V1->V6 (No change, patch introduced in V7)
> ---
> .../media/platform/verisilicon/hantro_jpeg.c | 128 ++----------------
> 1 file changed, 14 insertions(+), 114 deletions(-)
>
> diff --git a/drivers/media/platform/verisilicon/hantro_jpeg.c b/drivers/media/platform/verisilicon/hantro_jpeg.c
> index d07b1b449b61..fa4e8ee92c05 100644
> --- a/drivers/media/platform/verisilicon/hantro_jpeg.c
> +++ b/drivers/media/platform/verisilicon/hantro_jpeg.c
> @@ -11,6 +11,7 @@
> #include <linux/build_bug.h>
> #include <linux/kernel.h>
> #include <linux/string.h>
> +#include <media/v4l2-jpeg.h>
> #include "hantro_jpeg.h"
> #include "hantro.h"
>
> @@ -24,42 +25,6 @@
> #define HUFF_CHROMA_DC_OFF 394
> #define HUFF_CHROMA_AC_OFF 427
>
> -/* Default tables from JPEG ITU-T.81
> - * (ISO/IEC 10918-1) Annex K, tables K.1 and K.2
> - */
> -static const unsigned char luma_q_table[] = {
> - 0x10, 0x0b, 0x0a, 0x10, 0x18, 0x28, 0x33, 0x3d,
> - 0x0c, 0x0c, 0x0e, 0x13, 0x1a, 0x3a, 0x3c, 0x37,
> - 0x0e, 0x0d, 0x10, 0x18, 0x28, 0x39, 0x45, 0x38,
> - 0x0e, 0x11, 0x16, 0x1d, 0x33, 0x57, 0x50, 0x3e,
> - 0x12, 0x16, 0x25, 0x38, 0x44, 0x6d, 0x67, 0x4d,
> - 0x18, 0x23, 0x37, 0x40, 0x51, 0x68, 0x71, 0x5c,
> - 0x31, 0x40, 0x4e, 0x57, 0x67, 0x79, 0x78, 0x65,
> - 0x48, 0x5c, 0x5f, 0x62, 0x70, 0x64, 0x67, 0x63
> -};
> -
> -static const unsigned char chroma_q_table[] = {
> - 0x11, 0x12, 0x18, 0x2f, 0x63, 0x63, 0x63, 0x63,
> - 0x12, 0x15, 0x1a, 0x42, 0x63, 0x63, 0x63, 0x63,
> - 0x18, 0x1a, 0x38, 0x63, 0x63, 0x63, 0x63, 0x63,
> - 0x2f, 0x42, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
> - 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
> - 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
> - 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
> - 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63
> -};
> -
> -static const unsigned char zigzag[] = {
> - 0, 1, 8, 16, 9, 2, 3, 10,
> - 17, 24, 32, 25, 18, 11, 4, 5,
> - 12, 19, 26, 33, 40, 48, 41, 34,
> - 27, 20, 13, 6, 7, 14, 21, 28,
> - 35, 42, 49, 56, 57, 50, 43, 36,
> - 29, 22, 15, 23, 30, 37, 44, 51,
> - 58, 59, 52, 45, 38, 31, 39, 46,
> - 53, 60, 61, 54, 47, 55, 62, 63
> -};
> -
> static const u32 hw_reorder[] = {
> 0, 8, 16, 24, 1, 9, 17, 25,
> 32, 40, 48, 56, 33, 41, 49, 57,
> @@ -71,73 +36,6 @@ static const u32 hw_reorder[] = {
> 38, 46, 54, 62, 39, 47, 55, 63
> };
>
> -/* Huffman tables are shared with CODA */
> -static const unsigned char luma_dc_table[] = {
> - 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
> - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
> - 0x08, 0x09, 0x0a, 0x0b,
> -};
> -
> -static const unsigned char chroma_dc_table[] = {
> - 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
> - 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
> - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
> - 0x08, 0x09, 0x0a, 0x0b,
> -};
> -
> -static const unsigned char luma_ac_table[] = {
> - 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
> - 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
> - 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
> - 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
> - 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
> - 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
> - 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
> - 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
> - 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
> - 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
> - 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
> - 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
> - 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
> - 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
> - 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
> - 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
> - 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
> - 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
> - 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
> - 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
> - 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
> - 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
> - 0xf9, 0xfa,
> -};
> -
> -static const unsigned char chroma_ac_table[] = {
> - 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
> - 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
> - 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
> - 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
> - 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
> - 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
> - 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
> - 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
> - 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
> - 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
> - 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
> - 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
> - 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
> - 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
> - 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
> - 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
> - 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
> - 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
> - 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
> - 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
> - 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
> - 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
> - 0xf9, 0xfa,
> -};
> -
> /* For simplicity, we keep a pre-formatted JPEG header,
> * and we'll use fixed offsets to change the width, height
> * quantization tables, etc.
> @@ -291,10 +189,11 @@ jpeg_scale_quant_table(unsigned char *file_q_tab,
> const unsigned char *tab, int scale)
> {
> int i;
> + const u8 *zigzag;
>
> - BUILD_BUG_ON(ARRAY_SIZE(zigzag) != JPEG_QUANT_SIZE);
> BUILD_BUG_ON(ARRAY_SIZE(hw_reorder) != JPEG_QUANT_SIZE);
>
> + v4l2_jpeg_get_zig_zag_scan(&zigzag);
> for (i = 0; i < JPEG_QUANT_SIZE; i++) {
> file_q_tab[i] = jpeg_scale_qp(tab[zigzag[i]], scale);
> reordered_q_tab[i] = jpeg_scale_qp(tab[hw_reorder[i]], scale);
> @@ -304,6 +203,7 @@ jpeg_scale_quant_table(unsigned char *file_q_tab,
> static void jpeg_set_quality(struct hantro_jpeg_ctx *ctx)
> {
> int scale;
> + const u8 *luma_q_table, *chroma_q_table;
>
> /*
> * Non-linear scaling factor:
> @@ -314,21 +214,23 @@ static void jpeg_set_quality(struct hantro_jpeg_ctx *ctx)
> else
> scale = 200 - 2 * ctx->quality;
>
> - BUILD_BUG_ON(ARRAY_SIZE(luma_q_table) != JPEG_QUANT_SIZE);
> - BUILD_BUG_ON(ARRAY_SIZE(chroma_q_table) != JPEG_QUANT_SIZE);
> BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_luma_qtable) != JPEG_QUANT_SIZE);
> BUILD_BUG_ON(ARRAY_SIZE(ctx->hw_chroma_qtable) != JPEG_QUANT_SIZE);
>
> + v4l2_jpeg_get_reference_quantization_tables(&luma_q_table, &chroma_q_table);
> jpeg_scale_quant_table(ctx->buffer + LUMA_QUANT_OFF,
> - ctx->hw_luma_qtable, luma_q_table, scale);
> + ctx->hw_luma_qtable, (const unsigned char *)luma_q_table, scale);
> jpeg_scale_quant_table(ctx->buffer + CHROMA_QUANT_OFF,
> - ctx->hw_chroma_qtable, chroma_q_table, scale);
> + ctx->hw_chroma_qtable, (const unsigned char *)chroma_q_table, scale);
> }
>
> void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
> {
> char *buf = ctx->buffer;
> + const u8 *luma_dc_table, *chroma_dc_table, *luma_ac_table, *chroma_ac_table;
>
> + v4l2_jpeg_get_reference_huffman_tables(&luma_dc_table, &luma_ac_table, &chroma_dc_table,
> + &chroma_ac_table);
> memcpy(buf, hantro_jpeg_header,
> sizeof(hantro_jpeg_header));
>
> @@ -337,12 +239,10 @@ void hantro_jpeg_header_assemble(struct hantro_jpeg_ctx *ctx)
> buf[WIDTH_OFF + 0] = ctx->width >> 8;
> buf[WIDTH_OFF + 1] = ctx->width;
>
> - memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, sizeof(luma_dc_table));
> - memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, sizeof(luma_ac_table));
> - memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table,
> - sizeof(chroma_dc_table));
> - memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table,
> - sizeof(chroma_ac_table));
> + memcpy(buf + HUFF_LUMA_DC_OFF, luma_dc_table, V4L2_JPEG_REF_HT_DC_LEN);
> + memcpy(buf + HUFF_LUMA_AC_OFF, luma_ac_table, V4L2_JPEG_REF_HT_AC_LEN);
> + memcpy(buf + HUFF_CHROMA_DC_OFF, chroma_dc_table, V4L2_JPEG_REF_HT_DC_LEN);
> + memcpy(buf + HUFF_CHROMA_AC_OFF, chroma_ac_table, V4L2_JPEG_REF_HT_AC_LEN);
>
> jpeg_set_quality(ctx);
> }
> --
> 2.39.1
>
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-10 8:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240510082603.1263256-1>
2024-05-10 8:34 ` [PATCH RESEND v7 4/8] media: imagination: Use exported tables from v4l2-jpeg core Devarsh Thakkar
2024-05-10 8:35 ` [PATCH RESEND v7 5/8] media: verisilcon : Use exported tables from v4l2-jpeg for hantro codec Devarsh Thakkar
2024-05-10 8:50 ` Chen-Yu Tsai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).