timoreo/quirc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Deinterleave blocks correct.

Browse source 
Use explicit small-block count. Derived value using greedy calculation
wasn't correct in many cases.
This commit is contained in:
Daniel Beer 2016-12-28 15:37:18 +13:00
parent fccbbce758
commit 59182ef1cd
3 changed files with 175 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/decode.c
View file

@ -576,10 +576,11 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
&quirc_version_db[data->version]; &quirc_version_db[data->version];
const struct quirc_rs_params *sb_ecc = &ver->ecc[data->ecc_level]; const struct quirc_rs_params *sb_ecc = &ver->ecc[data->ecc_level];
struct quirc_rs_params lb_ecc; struct quirc_rs_params lb_ecc;
int bc = ver->data_bytes / sb_ecc->bs; const int lb_count =
(ver->data_bytes - sb_ecc->bs * sb_ecc->ns) / (sb_ecc->bs + 1);
const int bc = lb_count + sb_ecc->ns;
const int ecc_offset = sb_ecc->dw * bc + lb_count;
int dst_offset = 0; int dst_offset = 0;
int lb_count = ver->data_bytes - bc * sb_ecc->bs;
int small_dw_total = bc * sb_ecc->dw;
int i; int i;
memcpy(&lb_ecc, sb_ecc, sizeof(lb_ecc)); memcpy(&lb_ecc, sb_ecc, sizeof(lb_ecc));
@ -588,22 +589,16 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
for (i = 0; i < bc; i++) { for (i = 0; i < bc; i++) {
uint8_t *dst = ds->data + dst_offset; uint8_t *dst = ds->data + dst_offset;
const struct quirc_rs_params *ecc = sb_ecc; const struct quirc_rs_params *ecc =
(i < sb_ecc->ns) ? sb_ecc : &lb_ecc;
const int num_ec = ecc->bs - ecc->dw;
quirc_decode_error_t err; quirc_decode_error_t err;
int j = 0; int j;
int k;
for (k = 0; k < sb_ecc->dw; k++) for (j = 0; j < ecc->dw; j++)
dst[j++] = ds->raw[k * bc + i]; dst[j] = ds->raw[j * bc + i];
for (j = 0; j < num_ec; j++)
if (i + lb_count >= bc) { dst[ecc->dw + j] = ds->raw[ecc_offset + j * bc + i];
dst[j++] = ds->raw[small_dw_total + i - lb_count];
ecc = &lb_ecc;
}
for (k = 0; k < sb_ecc->bs - sb_ecc->dw; k++)
dst[j++] = ds->raw[small_dw_total + lb_count + i +
k * bc];
err = correct_block(dst, ecc); err = correct_block(dst, ecc);
if (err) if (err)

6
lib/quirc_internal.h
View file

@ -98,9 +98,9 @@ struct quirc {
#define QUIRC_MAX_ALIGNMENT 7 #define QUIRC_MAX_ALIGNMENT 7
struct quirc_rs_params { struct quirc_rs_params {
int bs; /* Block size */ int bs; /* Small block size */
int dw; /* Data words */ int dw; /* Small data words */
int ce; /* Correctable errors */ int ns; /* Number of small blocks */
}; };
struct quirc_version_info { struct quirc_version_info {

320
lib/version_db.c
View file

@ -22,400 +22,400 @@ const struct quirc_version_info quirc_version_db[QUIRC_MAX_VERSION + 1] = {
.data_bytes = 26, .data_bytes = 26,
.apat = {0}, .apat = {0},
.ecc = { .ecc = {
{.bs = 26, .dw = 16, .ce = 4}, {.bs = 26, .dw = 16, .ns = 1},
{.bs = 26, .dw = 19, .ce = 2}, {.bs = 26, .dw = 19, .ns = 1},
{.bs = 26, .dw = 9, .ce = 8}, {.bs = 26, .dw = 9, .ns = 1},
{.bs = 26, .dw = 13, .ce = 6} {.bs = 26, .dw = 13, .ns = 1}
} }
}, },
{ /* Version 2 */ { /* Version 2 */
.data_bytes = 44, .data_bytes = 44,
.apat = {6, 18, 0}, .apat = {6, 18, 0},
.ecc = { .ecc = {
{.bs = 44, .dw = 28, .ce = 8}, {.bs = 44, .dw = 28, .ns = 1},
{.bs = 44, .dw = 34, .ce = 4}, {.bs = 44, .dw = 34, .ns = 1},
{.bs = 44, .dw = 16, .ce = 14}, {.bs = 44, .dw = 16, .ns = 1},
{.bs = 44, .dw = 22, .ce = 11} {.bs = 44, .dw = 22, .ns = 1}
} }
}, },
{ /* Version 3 */ { /* Version 3 */
.data_bytes = 70, .data_bytes = 70,
.apat = {6, 22, 0}, .apat = {6, 22, 0},
.ecc = { .ecc = {
{.bs = 70, .dw = 44, .ce = 13}, {.bs = 70, .dw = 44, .ns = 1},
{.bs = 70, .dw = 55, .ce = 7}, {.bs = 70, .dw = 55, .ns = 1},
{.bs = 35, .dw = 13, .ce = 11}, {.bs = 35, .dw = 13, .ns = 2},
{.bs = 35, .dw = 17, .ce = 9} {.bs = 35, .dw = 17, .ns = 2}
} }
}, },
{ /* Version 4 */ { /* Version 4 */
.data_bytes = 100, .data_bytes = 100,
.apat = {6, 26, 0}, .apat = {6, 26, 0},
.ecc = { .ecc = {
{.bs = 50, .dw = 32, .ce = 9}, {.bs = 50, .dw = 32, .ns = 2},
{.bs = 100, .dw = 80, .ce = 10}, {.bs = 100, .dw = 80, .ns = 1},
{.bs = 25, .dw = 9, .ce = 8}, {.bs = 25, .dw = 9, .ns = 4},
{.bs = 50, .dw = 24, .ce = 13} {.bs = 50, .dw = 24, .ns = 2}
} }
}, },
{ /* Version 5 */ { /* Version 5 */
.data_bytes = 134, .data_bytes = 134,
.apat = {6, 30, 0}, .apat = {6, 30, 0},
.ecc = { .ecc = {
{.bs = 67, .dw = 43, .ce = 12}, {.bs = 67, .dw = 43, .ns = 2},
{.bs = 134, .dw = 108, .ce = 13}, {.bs = 134, .dw = 108, .ns = 1},
{.bs = 33, .dw = 11, .ce = 11}, {.bs = 33, .dw = 11, .ns = 2},
{.bs = 33, .dw = 15, .ce = 9} {.bs = 33, .dw = 15, .ns = 2}
} }
}, },
{ /* Version 6 */ { /* Version 6 */
.data_bytes = 172, .data_bytes = 172,
.apat = {6, 34, 0}, .apat = {6, 34, 0},
.ecc = { .ecc = {
{.bs = 43, .dw = 27, .ce = 8}, {.bs = 43, .dw = 27, .ns = 4},
{.bs = 86, .dw = 68, .ce = 9}, {.bs = 86, .dw = 68, .ns = 2},
{.bs = 43, .dw = 15, .ce = 14}, {.bs = 43, .dw = 15, .ns = 4},
{.bs = 43, .dw = 19, .ce = 12} {.bs = 43, .dw = 19, .ns = 4}
} }
}, },
{ /* Version 7 */ { /* Version 7 */
.data_bytes = 196, .data_bytes = 196,
.apat = {6, 22, 38, 0}, .apat = {6, 22, 38, 0},
.ecc = { .ecc = {
{.bs = 49, .dw = 31, .ce = 9}, {.bs = 49, .dw = 31, .ns = 4},
{.bs = 98, .dw = 78, .ce = 10}, {.bs = 98, .dw = 78, .ns = 2},
{.bs = 39, .dw = 13, .ce = 13}, {.bs = 39, .dw = 13, .ns = 4},
{.bs = 32, .dw = 14, .ce = 9} {.bs = 32, .dw = 14, .ns = 2}
} }
}, },
{ /* Version 8 */ { /* Version 8 */
.data_bytes = 242, .data_bytes = 242,
.apat = {6, 24, 42, 0}, .apat = {6, 24, 42, 0},
.ecc = { .ecc = {
{.bs = 60, .dw = 38, .ce = 11}, {.bs = 60, .dw = 38, .ns = 2},
{.bs = 121, .dw = 97, .ce = 12}, {.bs = 121, .dw = 97, .ns = 2},
{.bs = 40, .dw = 14, .ce = 13}, {.bs = 40, .dw = 14, .ns = 4},
{.bs = 40, .dw = 18, .ce = 11} {.bs = 40, .dw = 18, .ns = 4}
} }
}, },
{ /* Version 9 */ { /* Version 9 */
.data_bytes = 292, .data_bytes = 292,
.apat = {6, 26, 46, 0}, .apat = {6, 26, 46, 0},
.ecc = { .ecc = {
{.bs = 58, .dw = 36, .ce = 11}, {.bs = 58, .dw = 36, .ns = 3},
{.bs = 146, .dw = 116, .ce = 15}, {.bs = 146, .dw = 116, .ns = 2},
{.bs = 36, .dw = 12, .ce = 12}, {.bs = 36, .dw = 12, .ns = 4},
{.bs = 36, .dw = 16, .ce = 10} {.bs = 36, .dw = 16, .ns = 4}
} }
}, },
{ /* Version 10 */ { /* Version 10 */
.data_bytes = 346, .data_bytes = 346,
.apat = {6, 28, 50, 0}, .apat = {6, 28, 50, 0},
.ecc = { .ecc = {
{.bs = 69, .dw = 43, .ce = 13}, {.bs = 69, .dw = 43, .ns = 4},
{.bs = 86, .dw = 68, .ce = 9}, {.bs = 86, .dw = 68, .ns = 2},
{.bs = 43, .dw = 15, .ce = 14}, {.bs = 43, .dw = 15, .ns = 6},
{.bs = 43, .dw = 19, .ce = 12} {.bs = 43, .dw = 19, .ns = 6}
} }
}, },
{ /* Version 11 */ { /* Version 11 */
.data_bytes = 404, .data_bytes = 404,
.apat = {6, 30, 54, 0}, .apat = {6, 30, 54, 0},
.ecc = { .ecc = {
{.bs = 80, .dw = 50, .ce = 15}, {.bs = 80, .dw = 50, .ns = 1},
{.bs = 101, .dw = 81, .ce = 10}, {.bs = 101, .dw = 81, .ns = 4},
{.bs = 36, .dw = 12, .ce = 12}, {.bs = 36, .dw = 12, .ns = 3},
{.bs = 50, .dw = 22, .ce = 14} {.bs = 50, .dw = 22, .ns = 4}
} }
}, },
{ /* Version 12 */ { /* Version 12 */
.data_bytes = 466, .data_bytes = 466,
.apat = {6, 32, 58, 0}, .apat = {6, 32, 58, 0},
.ecc = { .ecc = {
{.bs = 58, .dw = 36, .ce = 11}, {.bs = 58, .dw = 36, .ns = 6},
{.bs = 116, .dw = 92, .ce = 12}, {.bs = 116, .dw = 92, .ns = 2},
{.bs = 42, .dw = 14, .ce = 14}, {.bs = 42, .dw = 14, .ns = 7},
{.bs = 46, .dw = 20, .ce = 14} {.bs = 46, .dw = 20, .ns = 4}
} }
}, },
{ /* Version 13 */ { /* Version 13 */
.data_bytes = 532, .data_bytes = 532,
.apat = {6, 34, 62, 0}, .apat = {6, 34, 62, 0},
.ecc = { .ecc = {
{.bs = 59, .dw = 37, .ce = 11}, {.bs = 59, .dw = 37, .ns = 8},
{.bs = 133, .dw = 107, .ce = 13}, {.bs = 133, .dw = 107, .ns = 4},
{.bs = 33, .dw = 11, .ce = 11}, {.bs = 33, .dw = 11, .ns = 12},
{.bs = 44, .dw = 20, .ce = 12} {.bs = 44, .dw = 20, .ns = 8}
} }
}, },
{ /* Version 14 */ { /* Version 14 */
.data_bytes = 581, .data_bytes = 581,
.apat = {6, 26, 46, 66, 0}, .apat = {6, 26, 46, 66, 0},
.ecc = { .ecc = {
{.bs = 64, .dw = 40, .ce = 12}, {.bs = 64, .dw = 40, .ns = 4},
{.bs = 145, .dw = 115, .ce = 11}, {.bs = 145, .dw = 115, .ns = 3},
{.bs = 36, .dw = 12, .ce = 12}, {.bs = 36, .dw = 12, .ns = 11},
{.bs = 36, .dw = 16, .ce = 15} {.bs = 36, .dw = 16, .ns = 11}
} }
}, },
{ /* Version 15 */ { /* Version 15 */
.data_bytes = 655, .data_bytes = 655,
.apat = {6, 26, 48, 70, 0}, .apat = {6, 26, 48, 70, 0},
.ecc = { .ecc = {
{.bs = 65, .dw = 41, .ce = 12}, {.bs = 65, .dw = 41, .ns = 5},
{.bs = 109, .dw = 87, .ce = 11}, {.bs = 109, .dw = 87, .ns = 5},
{.bs = 36, .dw = 12, .ce = 12}, {.bs = 36, .dw = 12, .ns = 11},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 5}
} }
}, },
{ /* Version 16 */ { /* Version 16 */
.data_bytes = 733, .data_bytes = 733,
.apat = {6, 26, 50, 74, 0}, .apat = {6, 26, 50, 74, 0},
.ecc = { .ecc = {
{.bs = 73, .dw = 45, .ce = 14}, {.bs = 73, .dw = 45, .ns = 7},
{.bs = 122, .dw = 98, .ce = 12}, {.bs = 122, .dw = 98, .ns = 5},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 3},
{.bs = 43, .dw = 19, .ce = 12} {.bs = 43, .dw = 19, .ns = 15}
} }
}, },
{ /* Version 17 */ { /* Version 17 */
.data_bytes = 815, .data_bytes = 815,
.apat = {6, 30, 54, 78, 0}, .apat = {6, 30, 54, 78, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 10},
{.bs = 135, .dw = 107, .ce = 14}, {.bs = 135, .dw = 107, .ns = 1},
{.bs = 42, .dw = 14, .ce = 14}, {.bs = 42, .dw = 14, .ns = 2},
{.bs = 50, .dw = 22, .ce = 14} {.bs = 50, .dw = 22, .ns = 1}
} }
}, },
{ /* Version 18 */ { /* Version 18 */
.data_bytes = 901, .data_bytes = 901,
.apat = {6, 30, 56, 82, 0}, .apat = {6, 30, 56, 82, 0},
.ecc = { .ecc = {
{.bs = 69, .dw = 43, .ce = 13}, {.bs = 69, .dw = 43, .ns = 9},
{.bs = 150, .dw = 120, .ce = 15}, {.bs = 150, .dw = 120, .ns = 5},
{.bs = 42, .dw = 14, .ce = 14}, {.bs = 42, .dw = 14, .ns = 2},
{.bs = 50, .dw = 22, .ce = 14} {.bs = 50, .dw = 22, .ns = 17}
} }
}, },
{ /* Version 19 */ { /* Version 19 */
.data_bytes = 991, .data_bytes = 991,
.apat = {6, 30, 58, 86, 0}, .apat = {6, 30, 58, 86, 0},
.ecc = { .ecc = {
{.bs = 70, .dw = 44, .ce = 13}, {.bs = 70, .dw = 44, .ns = 3},
{.bs = 141, .dw = 113, .ce = 14}, {.bs = 141, .dw = 113, .ns = 3},
{.bs = 39, .dw = 13, .ce = 13}, {.bs = 39, .dw = 13, .ns = 9},
{.bs = 47, .dw = 21, .ce = 13} {.bs = 47, .dw = 21, .ns = 17}
} }
}, },
{ /* Version 20 */ { /* Version 20 */
.data_bytes = 1085, .data_bytes = 1085,
.apat = {6, 34, 62, 90, 0}, .apat = {6, 34, 62, 90, 0},
.ecc = { .ecc = {
{.bs = 67, .dw = 41, .ce = 13}, {.bs = 67, .dw = 41, .ns = 3},
{.bs = 135, .dw = 107, .ce = 14}, {.bs = 135, .dw = 107, .ns = 3},
{.bs = 43, .dw = 15, .ce = 14}, {.bs = 43, .dw = 15, .ns = 15},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 15}
} }
}, },
{ /* Version 21 */ { /* Version 21 */
.data_bytes = 1156, .data_bytes = 1156,
.apat = {6, 28, 50, 72, 92, 0}, .apat = {6, 28, 50, 72, 92, 0},
.ecc = { .ecc = {
{.bs = 68, .dw = 42, .ce = 13}, {.bs = 68, .dw = 42, .ns = 17},
{.bs = 144, .dw = 116, .ce = 14}, {.bs = 144, .dw = 116, .ns = 4},
{.bs = 46, .dw = 16, .ce = 15}, {.bs = 46, .dw = 16, .ns = 19},
{.bs = 50, .dw = 22, .ce = 14} {.bs = 50, .dw = 22, .ns = 17}
} }
}, },
{ /* Version 22 */ { /* Version 22 */
.data_bytes = 1258, .data_bytes = 1258,
.apat = {6, 26, 50, 74, 98, 0}, .apat = {6, 26, 50, 74, 98, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 17},
{.bs = 139, .dw = 111, .ce = 14}, {.bs = 139, .dw = 111, .ns = 2},
{.bs = 37, .dw = 13, .ce = 12}, {.bs = 37, .dw = 13, .ns = 34},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 7}
} }
}, },
{ /* Version 23 */ { /* Version 23 */
.data_bytes = 1364, .data_bytes = 1364,
.apat = {6, 30, 54, 78, 102, 0}, .apat = {6, 30, 54, 78, 102, 0},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 4},
{.bs = 151, .dw = 121, .ce = 15}, {.bs = 151, .dw = 121, .ns = 4},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 16},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 11}
} }
}, },
{ /* Version 24 */ { /* Version 24 */
.data_bytes = 1474, .data_bytes = 1474,
.apat = {6, 28, 54, 80, 106, 0}, .apat = {6, 28, 54, 80, 106, 0},
.ecc = { .ecc = {
{.bs = 73, .dw = 45, .ce = 14}, {.bs = 73, .dw = 45, .ns = 6},
{.bs = 147, .dw = 117, .ce = 15}, {.bs = 147, .dw = 117, .ns = 6},
{.bs = 46, .dw = 16, .ce = 15}, {.bs = 46, .dw = 16, .ns = 30},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 11}
} }
}, },
{ /* Version 25 */ { /* Version 25 */
.data_bytes = 1588, .data_bytes = 1588,
.apat = {6, 32, 58, 84, 110, 0}, .apat = {6, 32, 58, 84, 110, 0},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 8},
{.bs = 132, .dw = 106, .ce = 13}, {.bs = 132, .dw = 106, .ns = 8},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 22},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 7}
} }
}, },
{ /* Version 26 */ { /* Version 26 */
.data_bytes = 1706, .data_bytes = 1706,
.apat = {6, 30, 58, 86, 114, 0}, .apat = {6, 30, 58, 86, 114, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 19},
{.bs = 142, .dw = 114, .ce = 14}, {.bs = 142, .dw = 114, .ns = 10},
{.bs = 46, .dw = 16, .ce = 15}, {.bs = 46, .dw = 16, .ns = 33},
{.bs = 50, .dw = 22, .ce = 14} {.bs = 50, .dw = 22, .ns = 28}
} }
}, },
{ /* Version 27 */ { /* Version 27 */
.data_bytes = 1828, .data_bytes = 1828,
.apat = {6, 34, 62, 90, 118, 0}, .apat = {6, 34, 62, 90, 118, 0},
.ecc = { .ecc = {
{.bs = 73, .dw = 45, .ce = 14}, {.bs = 73, .dw = 45, .ns = 22},
{.bs = 152, .dw = 122, .ce = 15}, {.bs = 152, .dw = 122, .ns = 8},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 12},
{.bs = 53, .dw = 23, .ce = 15} {.bs = 53, .dw = 23, .ns = 8}
} }
}, },
{ /* Version 28 */ { /* Version 28 */
.data_bytes = 1921, .data_bytes = 1921,
.apat = {6, 26, 50, 74, 98, 122, 0}, .apat = {6, 26, 50, 74, 98, 122, 0},
.ecc = { .ecc = {
{.bs = 73, .dw = 45, .ce = 14}, {.bs = 73, .dw = 45, .ns = 3},
{.bs = 147, .dw = 117, .ce = 15}, {.bs = 147, .dw = 117, .ns = 3},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 11},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 4}
} }
}, },
{ /* Version 29 */ { /* Version 29 */
.data_bytes = 2051, .data_bytes = 2051,
.apat = {6, 30, 54, 78, 102, 126, 0}, .apat = {6, 30, 54, 78, 102, 126, 0},
.ecc = { .ecc = {
{.bs = 73, .dw = 45, .ce = 14}, {.bs = 73, .dw = 45, .ns = 21},
{.bs = 146, .dw = 116, .ce = 15}, {.bs = 146, .dw = 116, .ns = 7},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 19},
{.bs = 43, .dw = 23, .ce = 14} {.bs = 53, .dw = 23, .ns = 1}
} }
}, },
{ /* Version 30 */ { /* Version 30 */
.data_bytes = 2185, .data_bytes = 2185,
.apat = {6, 26, 52, 78, 104, 130, 0}, .apat = {6, 26, 52, 78, 104, 130, 0},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 19},
{.bs = 145, .dw = 115, .ce = 15}, {.bs = 145, .dw = 115, .ns = 5},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 23},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 15}
} }
}, },
{ /* Version 31 */ { /* Version 31 */
.data_bytes = 2323, .data_bytes = 2323,
.apat = {6, 30, 56, 82, 108, 134, 0}, .apat = {6, 30, 56, 82, 108, 134, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 2},
{.bs = 145, .dw = 115, .ce = 15}, {.bs = 145, .dw = 115, .ns = 13},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 23},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 42}
} }
}, },
{ /* Version 32 */ { /* Version 32 */
.data_bytes = 2465, .data_bytes = 2465,
.apat = {6, 34, 60, 86, 112, 138, 0}, .apat = {6, 34, 60, 86, 112, 138, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 10},
{.bs = 145, .dw = 115, .ce = 15}, {.bs = 145, .dw = 115, .ns = 17},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 19},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 10}
} }
}, },
{ /* Version 33 */ { /* Version 33 */
.data_bytes = 2611, .data_bytes = 2611,
.apat = {6, 30, 58, 86, 114, 142, 0}, .apat = {6, 30, 58, 86, 114, 142, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 14},
{.bs = 145, .dw = 115, .ce = 15}, {.bs = 145, .dw = 115, .ns = 17},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 11},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 29}
} }
}, },
{ /* Version 34 */ { /* Version 34 */
.data_bytes = 2761, .data_bytes = 2761,
.apat = {6, 34, 62, 90, 118, 146, 0}, .apat = {6, 34, 62, 90, 118, 146, 0},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 14},
{.bs = 145, .dw = 115, .ce = 15}, {.bs = 145, .dw = 115, .ns = 13},
{.bs = 46, .dw = 16, .ce = 15}, {.bs = 46, .dw = 16, .ns = 59},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 44}
} }
}, },
{ /* Version 35 */ { /* Version 35 */
.data_bytes = 2876, .data_bytes = 2876,
.apat = {6, 30, 54, 78, 102, 126, 150}, .apat = {6, 30, 54, 78, 102, 126, 150},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 12},
{.bs = 151, .dw = 121, .ce = 15}, {.bs = 151, .dw = 121, .ns = 12},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 22},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 39}
} }
}, },
{ /* Version 36 */ { /* Version 36 */
.data_bytes = 3034, .data_bytes = 3034,
.apat = {6, 24, 50, 76, 102, 128, 154}, .apat = {6, 24, 50, 76, 102, 128, 154},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 6},
{.bs = 151, .dw = 121, .ce = 15}, {.bs = 151, .dw = 121, .ns = 6},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 2},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 46}
} }
}, },
{ /* Version 37 */ { /* Version 37 */
.data_bytes = 3196, .data_bytes = 3196,
.apat = {6, 28, 54, 80, 106, 132, 158}, .apat = {6, 28, 54, 80, 106, 132, 158},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 29},
{.bs = 152, .dw = 122, .ce = 15}, {.bs = 152, .dw = 122, .ns = 17},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 24},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 49}
} }
}, },
{ /* Version 38 */ { /* Version 38 */
.data_bytes = 3362, .data_bytes = 3362,
.apat = {6, 32, 58, 84, 110, 136, 162}, .apat = {6, 32, 58, 84, 110, 136, 162},
.ecc = { .ecc = {
{.bs = 74, .dw = 46, .ce = 14}, {.bs = 74, .dw = 46, .ns = 13},
{.bs = 152, .dw = 122, .ce = 15}, {.bs = 152, .dw = 122, .ns = 4},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 42},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 48}
} }
}, },
{ /* Version 39 */ { /* Version 39 */
.data_bytes = 3532, .data_bytes = 3532,
.apat = {6, 26, 54, 82, 110, 138, 166}, .apat = {6, 26, 54, 82, 110, 138, 166},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 40},
{.bs = 147, .dw = 117, .ce = 15}, {.bs = 147, .dw = 117, .ns = 20},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 10},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 43}
} }
}, },
{ /* Version 40 */ { /* Version 40 */
.data_bytes = 3706, .data_bytes = 3706,
.apat = {6, 30, 58, 86, 114, 142, 170}, .apat = {6, 30, 58, 86, 114, 142, 170},
.ecc = { .ecc = {
{.bs = 75, .dw = 47, .ce = 14}, {.bs = 75, .dw = 47, .ns = 18},
{.bs = 148, .dw = 118, .ce = 15}, {.bs = 148, .dw = 118, .ns = 19},
{.bs = 45, .dw = 15, .ce = 15}, {.bs = 45, .dw = 15, .ns = 20},
{.bs = 54, .dw = 24, .ce = 15} {.bs = 54, .dw = 24, .ns = 34}
} }
} }
}; };