tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

media: imagination: Use exported tables from v4l2-jpeg core

Use exported huffman and quantization tables from v4l2-jpeg core library.

Signed-off-by: Devarsh Thakkar <devarsht@ti.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 ceb9a33b 7dfa3259

+23 -131
+1
drivers/media/platform/imagination/Kconfig
··· 5 5 select VIDEOBUF2_DMA_CONTIG 6 6 select VIDEOBUF2_VMALLOC 7 7 select V4L2_MEM2MEM_DEV 8 + select V4L2_JPEG_HELPER 8 9 help 9 10 This is a video4linux2 M2M driver for Imagination E5010 JPEG encoder, 10 11 which supports JPEG and MJPEG baseline encoding of YUV422 and YUV420
+22 -131
drivers/media/platform/imagination/e5010-jpeg-enc.c
··· 32 32 #include "e5010-jpeg-enc.h" 33 33 #include "e5010-jpeg-enc-hw.h" 34 34 35 - /* Luma and chroma qp table to achieve 50% compression quality 36 - * This is as per example in Annex K.1 of ITU-T.81 37 - */ 38 - static const u8 luma_q_table[64] = { 39 - 16, 11, 10, 16, 24, 40, 51, 61, 40 - 12, 12, 14, 19, 26, 58, 60, 55, 41 - 14, 13, 16, 24, 40, 57, 69, 56, 42 - 14, 17, 22, 29, 51, 87, 80, 62, 43 - 18, 22, 37, 56, 68, 109, 103, 77, 44 - 24, 35, 55, 64, 81, 104, 113, 92, 45 - 49, 64, 78, 87, 103, 121, 120, 101, 46 - 72, 92, 95, 98, 112, 100, 103, 99 47 - }; 48 - 49 - static const u8 chroma_q_table[64] = { 50 - 17, 18, 24, 47, 99, 99, 99, 99, 51 - 18, 21, 26, 66, 99, 99, 99, 99, 52 - 24, 26, 56, 99, 99, 99, 99, 99, 53 - 47, 66, 99, 99, 99, 99, 99, 99, 54 - 99, 99, 99, 99, 99, 99, 99, 99, 55 - 99, 99, 99, 99, 99, 99, 99, 99, 56 - 99, 99, 99, 99, 99, 99, 99, 99, 57 - 99, 99, 99, 99, 99, 99, 99, 99 58 - }; 59 - 60 - /* Zigzag scan pattern */ 61 - static const u8 zigzag[64] = { 62 - 0, 1, 8, 16, 9, 2, 3, 10, 63 - 17, 24, 32, 25, 18, 11, 4, 5, 64 - 12, 19, 26, 33, 40, 48, 41, 34, 65 - 27, 20, 13, 6, 7, 14, 21, 28, 66 - 35, 42, 49, 56, 57, 50, 43, 36, 67 - 29, 22, 15, 23, 30, 37, 44, 51, 68 - 58, 59, 52, 45, 38, 31, 39, 46, 69 - 53, 60, 61, 54, 47, 55, 62, 63 70 - }; 71 - 72 - /* 73 - * Contains the data that needs to be sent in the marker segment of an interchange format JPEG 74 - * stream or an abbreviated format table specification data stream. 75 - * Specifies the huffman table used for encoding the luminance DC coefficient differences. 76 - * The table represents Table K.3 of ITU-T.81 77 - */ 78 - static const u8 luma_dc_table[] = { 79 - 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 80 - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 81 - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B 82 - }; 83 - 84 - /* 85 - * Contains the data that needs to be sent in the marker segment of an interchange format JPEG 86 - * stream or an abbreviated format table specification data stream. 87 - * Specifies the huffman table used for encoding the luminance AC coefficients. 88 - * The table represents Table K.5 of ITU-T.81 89 - */ 90 - static const u8 luma_ac_table[] = { 91 - 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 92 - 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D, 93 - 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 94 - 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 95 - 0xD1, 0xF0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 96 - 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 97 - 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 98 - 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 99 - 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 100 - 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 101 - 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 102 - 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 103 - 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA 104 - }; 105 - 106 - /* 107 - * Contains the data that needs to be sent in the marker segment of an interchange format JPEG 108 - * stream or an abbreviated format table specification data stream. 109 - * Specifies the huffman table used for encoding the chrominance DC coefficient differences. 110 - * The table represents Table K.4 of ITU-T.81 111 - */ 112 - static const u8 chroma_dc_table[] = { 113 - 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 114 - 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 115 - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B 116 - }; 117 - 118 - /* 119 - * Contains the data that needs to be sent in the marker segment of an interchange format JPEG 120 - * stream or an abbreviated format table specification data stream. 121 - * Specifies the huffman table used for encoding the chrominance AC coefficients. 122 - * The table represents Table K.6 of ITU-T.81 123 - */ 124 - static const u8 chroma_ac_table[] = { 125 - 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 126 - 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 127 - 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 128 - 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 129 - 0x52, 0xF0, 0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18, 130 - 0x19, 0x1A, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 131 - 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 132 - 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 133 - 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 134 - 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 135 - 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 136 - 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 137 - 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA 138 - }; 139 - 140 - #define JPEG_LUM_HT 0x00 141 - #define JPEG_CHR_HT 0x01 142 - #define JPEG_DC_HT 0x00 143 - #define JPEG_AC_HT 0x10 144 - 145 35 /* forward declarations */ 146 36 static const struct of_device_id e5010_of_match[]; 147 37 ··· 171 281 contrast *= INCREASE; 172 282 } 173 283 174 - for (i = 0; i < ARRAY_SIZE(luma_q_table); i++) { 175 - long long delta = chroma_q_table[i] * contrast + luminosity; 176 - int val = (int)(chroma_q_table[i] + delta); 284 + for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++) { 285 + long long delta = v4l2_jpeg_ref_table_chroma_qt[i] * contrast + luminosity; 286 + int val = (int)(v4l2_jpeg_ref_table_chroma_qt[i] + delta); 177 287 178 288 clamp(val, 1, 255); 179 289 ctx->chroma_qp[i] = quality == -50 ? 1 : val; 180 290 181 - delta = luma_q_table[i] * contrast + luminosity; 182 - val = (int)(luma_q_table[i] + delta); 291 + delta = v4l2_jpeg_ref_table_luma_qt[i] * contrast + luminosity; 292 + val = (int)(v4l2_jpeg_ref_table_luma_qt[i] + delta); 183 293 clamp(val, 1, 255); 184 294 ctx->luma_qp[i] = quality == -50 ? 1 : val; 185 295 } ··· 821 931 header_write(ctx, buffer, offset, 2, START_OF_IMAGE); 822 932 header_write(ctx, buffer, offset, 2, DQT_MARKER); 823 933 header_write(ctx, buffer, offset, 3, LQPQ << 4); 824 - for (i = 0; i < PELS_IN_BLOCK; i++) 825 - header_write(ctx, buffer, offset, 1, ctx->luma_qp[zigzag[i]]); 934 + for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++) 935 + header_write(ctx, buffer, offset, 1, ctx->luma_qp[v4l2_jpeg_zigzag_scan_index[i]]); 826 936 827 937 header_write(ctx, buffer, offset, 2, DQT_MARKER); 828 938 header_write(ctx, buffer, offset, 3, (LQPQ << 4) | 1); 829 - for (i = 0; i < PELS_IN_BLOCK; i++) 830 - header_write(ctx, buffer, offset, 1, ctx->chroma_qp[zigzag[i]]); 939 + for (i = 0; i < V4L2_JPEG_PIXELS_IN_BLOCK; i++) 940 + header_write(ctx, buffer, offset, 1, 941 + ctx->chroma_qp[v4l2_jpeg_zigzag_scan_index[i]]); 831 942 832 943 /* Huffman tables */ 833 944 header_write(ctx, buffer, offset, 2, DHT_MARKER); 834 945 header_write(ctx, buffer, offset, 2, LH_DC); 835 - header_write(ctx, buffer, offset, 1, JPEG_LUM_HT | JPEG_DC_HT); 836 - for (i = 0 ; i < ARRAY_SIZE(luma_dc_table); i++) 837 - header_write(ctx, buffer, offset, 1, luma_dc_table[i]); 946 + header_write(ctx, buffer, offset, 1, V4L2_JPEG_LUM_HT | V4L2_JPEG_DC_HT); 947 + for (i = 0 ; i < V4L2_JPEG_REF_HT_DC_LEN; i++) 948 + header_write(ctx, buffer, offset, 1, v4l2_jpeg_ref_table_luma_dc_ht[i]); 838 949 839 950 header_write(ctx, buffer, offset, 2, DHT_MARKER); 840 951 header_write(ctx, buffer, offset, 2, LH_AC); 841 - header_write(ctx, buffer, offset, 1, JPEG_LUM_HT | JPEG_AC_HT); 842 - for (i = 0 ; i < ARRAY_SIZE(luma_ac_table); i++) 843 - header_write(ctx, buffer, offset, 1, luma_ac_table[i]); 952 + header_write(ctx, buffer, offset, 1, V4L2_JPEG_LUM_HT | V4L2_JPEG_AC_HT); 953 + for (i = 0 ; i < V4L2_JPEG_REF_HT_AC_LEN; i++) 954 + header_write(ctx, buffer, offset, 1, v4l2_jpeg_ref_table_luma_ac_ht[i]); 844 955 845 956 header_write(ctx, buffer, offset, 2, DHT_MARKER); 846 957 header_write(ctx, buffer, offset, 2, LH_DC); 847 - header_write(ctx, buffer, offset, 1, JPEG_CHR_HT | JPEG_DC_HT); 848 - for (i = 0 ; i < ARRAY_SIZE(chroma_dc_table); i++) 849 - header_write(ctx, buffer, offset, 1, chroma_dc_table[i]); 958 + header_write(ctx, buffer, offset, 1, V4L2_JPEG_CHR_HT | V4L2_JPEG_DC_HT); 959 + for (i = 0 ; i < V4L2_JPEG_REF_HT_DC_LEN; i++) 960 + header_write(ctx, buffer, offset, 1, v4l2_jpeg_ref_table_chroma_dc_ht[i]); 850 961 851 962 header_write(ctx, buffer, offset, 2, DHT_MARKER); 852 963 header_write(ctx, buffer, offset, 2, LH_AC); 853 - header_write(ctx, buffer, offset, 1, JPEG_CHR_HT | JPEG_AC_HT); 854 - for (i = 0 ; i < ARRAY_SIZE(chroma_ac_table); i++) 855 - header_write(ctx, buffer, offset, 1, chroma_ac_table[i]); 964 + header_write(ctx, buffer, offset, 1, V4L2_JPEG_CHR_HT | V4L2_JPEG_AC_HT); 965 + for (i = 0 ; i < V4L2_JPEG_REF_HT_AC_LEN; i++) 966 + header_write(ctx, buffer, offset, 1, v4l2_jpeg_ref_table_chroma_ac_ht[i]); 856 967 } 857 968 858 969 static void encode_frame_header(struct e5010_context *ctx, void *addr, unsigned int *offset)