Skip to content

F
freeswitch
提交 1757331e authored 作者: Steve Underwood's avatar Steve Underwood
浏览文件
操作

Some cleanup of naming to prepare for the next step with spandsp

上级 97f0c030
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 840 行增加 和 495 行删除
libs/spandsp/src/spandsp/t30.h
浏览文件 @ 1757331e
......@@ -353,27 +353,27 @@ enum
enum
{
/*! No compression */
T30_SUPPORT_NO_COMPRESSION = 0x01,
T30_SUPPORT_COMPRESSION_NONE = 0x01,
/*! T.1 1D compression */
T30_SUPPORT_T4_1D_COMPRESSION = 0x02,
T30_SUPPORT_COMPRESSION_T4_1D = 0x02,
/*! T.4 2D compression */
T30_SUPPORT_T4_2D_COMPRESSION = 0x04,
T30_SUPPORT_COMPRESSION_T4_2D = 0x04,
/*! T.6 2D compression */
T30_SUPPORT_T6_COMPRESSION = 0x08,
T30_SUPPORT_COMPRESSION_T6 = 0x08,
/*! T.85 monochrome JBIG compression, with fixed L0 */
T30_SUPPORT_T85_COMPRESSION = 0x10,
T30_SUPPORT_COMPRESSION_T85 = 0x10,
/*! T.85 monochrome JBIG compression, with variable L0 */
T30_SUPPORT_T85_L0_COMPRESSION = 0x20,
T30_SUPPORT_COMPRESSION_T85_L0 = 0x20,
/*! T.43 colour JBIG compression */
T30_SUPPORT_T43_COMPRESSION = 0x40,
T30_SUPPORT_COMPRESSION_T43 = 0x40,
/*! T.45 run length colour compression */
T30_SUPPORT_T45_COMPRESSION = 0x80,
T30_SUPPORT_COMPRESSION_T45 = 0x80,
/*! T.81 + T.30 Annex E colour JPEG compression */
T30_SUPPORT_T81_COMPRESSION = 0x100,
T30_SUPPORT_COMPRESSION_T81 = 0x100,
/*! T.81 + T.30 Annex K colour sYCC-JPEG compression */
T30_SUPPORT_SYCC_T81_COMPRESSION = 0x200,
T30_SUPPORT_COMPRESSION_SYCC_T81 = 0x200,
/*! T.88 monochrome JBIG2 compression */
T30_SUPPORT_T88_COMPRESSION = 0x400,
T30_SUPPORT_COMPRESSION_T88 = 0x400,
/*! Dither a gray scale image down a simple bilevel image, with rescaling to fit a FAX page */
T30_SUPPORT_GRAY_TO_BILEVEL = 0x10000000,
/*! Dither a colour image down a simple bilevel image, with rescaling to fit a FAX page */
......
libs/spandsp/src/spandsp/t30_api.h
浏览文件 @ 1757331e
......@@ -439,8 +439,8 @@ SPAN_DECLARE(int) t30_set_ecm_capability(t30_state_t *s, int enabled);
/*! Specify the output encoding for TIFF files created during FAX reception.
\brief Specify the output encoding for TIFF files created during FAX reception.
\param s The T.30 context.
\param encoding The coding required. The options are T4_COMPRESSION_ITU_T4_1D,
T4_COMPRESSION_ITU_T4_2D, T4_COMPRESSION_ITU_T6. T6 is usually the
\param encoding The coding required. The options are T4_COMPRESSION_T4_1D,
T4_COMPRESSION_T4_2D, T4_COMPRESSION_T6. T6 is usually the
densest option, but support for it is broken in a number of software
packages.
\return 0 if OK, else -1. */
......
libs/spandsp/src/spandsp/t4_rx.h
浏览文件 @ 1757331e
......@@ -51,23 +51,23 @@ typedef enum
/*! No compression */
T4_COMPRESSION_NONE = 0,
/*! T.1 1D compression */
T4_COMPRESSION_ITU_T4_1D = 1,
T4_COMPRESSION_T4_1D = 1,
/*! T.4 2D compression */
T4_COMPRESSION_ITU_T4_2D = 2,
T4_COMPRESSION_T4_2D = 2,
/*! T.6 2D compression */
T4_COMPRESSION_ITU_T6 = 3,
T4_COMPRESSION_T6 = 3,
/*! T.85 monochrome JBIG coding with L0 fixed. */
T4_COMPRESSION_ITU_T85 = 4,
T4_COMPRESSION_T85 = 4,
/*! T.85 monochrome JBIG coding with L0 variable. */
T4_COMPRESSION_ITU_T85_L0 = 5,
T4_COMPRESSION_T85_L0 = 5,
/*! T.43 colour JBIG coding */
T4_COMPRESSION_ITU_T43 = 6,
T4_COMPRESSION_T43 = 6,
/*! T.45 run length colour compression */
T4_COMPRESSION_ITU_T45 = 7,
T4_COMPRESSION_T45 = 7,
/*! T.42 + T.81 + T.30 Annex E colour JPEG coding */
T4_COMPRESSION_ITU_T42 = 8,
T4_COMPRESSION_T42 = 8,
/*! T.42 + T.81 + T.30 Annex K colour sYCC-JPEG coding */
T4_COMPRESSION_ITU_SYCC_T42 = 9
T4_COMPRESSION_SYCC_T42 = 9
} t4_image_compression_t;
/*! Image type */
......@@ -84,9 +84,12 @@ typedef enum
/*! Supported X resolutions, in pixels per metre. */
typedef enum
{
T4_X_RESOLUTION_100 = 3937,
T4_X_RESOLUTION_R4 = 4016,
T4_X_RESOLUTION_200 = 7874,
T4_X_RESOLUTION_R8 = 8031,
T4_X_RESOLUTION_300 = 11811,
T4_X_RESOLUTION_400 = 15784,
T4_X_RESOLUTION_R16 = 16063,
T4_X_RESOLUTION_600 = 23622,
T4_X_RESOLUTION_800 = 31496,
......@@ -97,14 +100,54 @@ typedef enum
typedef enum
{
T4_Y_RESOLUTION_STANDARD = 3850,
T4_Y_RESOLUTION_100 = 3937,
T4_Y_RESOLUTION_FINE = 7700,
T4_Y_RESOLUTION_200 = 7874,
T4_Y_RESOLUTION_300 = 11811,
T4_Y_RESOLUTION_SUPERFINE = 15400, /* 400 is 15748 */
T4_Y_RESOLUTION_SUPERFINE = 15400,
T4_Y_RESOLUTION_400 = 15748,
T4_Y_RESOLUTION_600 = 23622,
T4_Y_RESOLUTION_800 = 31496,
T4_Y_RESOLUTION_1200 = 47244
} t4_image_y_resolution_t;
/* Only the symmetric resolutions are valid for gray-scale and colour use. The asymmetric
ones are bi-level only. */
enum
{
/*! Support standard FAX resolution 204dpi x 98dpi - bi-level only */
T4_RESOLUTION_R8_STANDARD = 0x1,
/*! Support fine FAX resolution 204dpi x 196dpi - bi-level only */
T4_RESOLUTION_R8_FINE = 0x2,
/*! Support superfine FAX resolution 204dpi x 392dpi - bi-level only */
T4_RESOLUTION_R8_SUPERFINE = 0x4,
/*! Support double FAX resolution 408dpi x 392dpi - bi-level only */
T4_RESOLUTION_R16_SUPERFINE = 0x8,
/*! Support 100dpi x 100 dpi */
T4_RESOLUTION_100_100 = 0x10,
/*! Support 200dpi x 100 dpi - bi-level only */
T4_RESOLUTION_200_100 = 0x20,
/*! Support 200dpi x 200 dpi */
T4_RESOLUTION_200_200 = 0x40,
/*! Support 200dpi x 400 dpi - bi-level only */
T4_RESOLUTION_200_400 = 0x80,
/*! Support 300dpi x 300 dpi */
T4_RESOLUTION_300_300 = 0x100,
/*! Support 300dpi x 600 dpi - bi-level only */
T4_RESOLUTION_300_600 = 0x200,
/*! Support 400dpi x 400 dpi */
T4_RESOLUTION_400_400 = 0x400,
/*! Support 400dpi x 800 dpi - bi-level only */
T4_RESOLUTION_400_800 = 0x800,
/*! Support 600dpi x 600 dpi */
T4_RESOLUTION_600_600 = 0x1000,
/*! Support 600dpi x 1200 dpi - bi-level only */
T4_RESOLUTION_600_1200 = 0x2000,
/*! Support 1200dpi x 1200 dpi */
T4_RESOLUTION_1200_1200 = 0x4000
};
/*!
Exact widths in PELs for the difference resolutions, and page widths.
Note:
......@@ -112,30 +155,53 @@ typedef enum
The R4 resolution widths are not supported in recent versions of T.30
Only images of exactly these widths are acceptable for FAX transmisson.
R4 864 pels/215mm for ISO A4, North American Letter and Legal
R4 1024 pels/255mm for ISO B4
R4 1216 pels/303mm for ISO A3
R8 1728 pels/215mm for ISO A4, North American Letter and Legal
R8 2048 pels/255mm for ISO B4
R8 2432 pels/303mm for ISO A3
R16 3456 pels/215mm for ISO A4, North American Letter and Legal
R16 4096 pels/255mm for ISO B4
R16 4864 pels/303mm for ISO A3
R4 864 pels/215mm for ISO A4, North American Letter and Legal
R4 1024 pels/255mm for ISO B4
R4 1216 pels/303mm for ISO A3
R8 1728 pels/215mm for ISO A4, North American Letter and Legal
R8 2048 pels/255mm for ISO B4
R8 2432 pels/303mm for ISO A3
R16 3456 pels/215mm for ISO A4, North American Letter and Legal
R16 4096 pels/255mm for ISO B4
R16 4864 pels/303mm for ISO A3
100 864 pels/219.46mm for ISO A4, North American Letter and Legal
100 1024 pels/260.10mm for ISO B4
100 1216 pels/308.86mm for ISO A3
200 1728 pels/219.46mm for ISO A4, North American Letter and Legal
200 2048 pels/260.10mm for ISO B4
200 2432 pels/308.86mm for ISO A3
300 2592 pels/219.46mm for ISO A4, North American Letter and Legal
300 3072 pels/260.10mm for ISO B4
300 3648 pels/308.86mm for ISO A3
400 3456 pels/219.46mm for ISO A4, North American Letter and Legal
400 4096 pels/260.10mm for ISO B4
400 4864 pels/308.86mm for ISO A3
600 5184 pels/219.46mm for ISO A4, North American Letter and Legal
600 6144 pels/260.10mm for ISO B4
600 7296 pels/308.86mm for ISO A3
1200 10368 pels/219.46mm for ISO A4, North American Letter and Legal
1200 12288 pels/260.10mm for ISO B4
1200 14592 pels/308.86mm for ISO A3
Note that R4, R8 and R16 widths are 5mm wider than the actual paper sizes.
The 100, 200, 300, 400, 600, and 1200 widths are 9.46mm, 10.1mm and 11.86mm
wider than the paper sizes.
*/
typedef enum
{
T4_WIDTH_R4_A4 = 864,
T4_WIDTH_R4_B4 = 1024,
T4_WIDTH_R4_A3 = 1216,
T4_WIDTH_R8_A4 = 1728,
T4_WIDTH_R8_B4 = 2048,
T4_WIDTH_R8_A3 = 2432,
T4_WIDTH_100_A4 = 864,
T4_WIDTH_100_B4 = 1024,
T4_WIDTH_100_A3 = 1216,
T4_WIDTH_200_A4 = 1728,
T4_WIDTH_200_B4 = 2048,
T4_WIDTH_200_A3 = 2432,
T4_WIDTH_300_A4 = 2592,
T4_WIDTH_300_B4 = 3072,
T4_WIDTH_300_A3 = 3648,
T4_WIDTH_R16_A4 = 3456,
T4_WIDTH_R16_B4 = 4096,
T4_WIDTH_R16_A3 = 4864,
T4_WIDTH_400_A4 = 3456,
T4_WIDTH_400_B4 = 4096,
T4_WIDTH_400_A3 = 4864,
T4_WIDTH_600_A4 = 5184,
T4_WIDTH_600_B4 = 6144,
T4_WIDTH_600_A3 = 7296,
......@@ -144,14 +210,26 @@ typedef enum
T4_WIDTH_1200_A3 = 14592
} t4_image_width_t;
#define T4_WIDTH_R4_A4 T4_WIDTH_100_A4
#define T4_WIDTH_R4_B4 T4_WIDTH_100_B4
#define T4_WIDTH_R4_A3 T4_WIDTH_100_A3
#define T4_WIDTH_R8_A4 T4_WIDTH_200_A4
#define T4_WIDTH_R8_B4 T4_WIDTH_200_B4
#define T4_WIDTH_R8_A3 T4_WIDTH_200_A3
#define T4_WIDTH_R16_A4 T4_WIDTH_400_A4
#define T4_WIDTH_R16_B4 T4_WIDTH_400_B4
#define T4_WIDTH_R16_A3 T4_WIDTH_400_A3
/*!
Length of the various supported paper sizes, in pixels at the various Y resolutions.
Paper sizes are
A4 (215mm x 297mm)
B4 (255mm x 364mm)
A3 (303mm x 418.56mm)
North American Letter (215.9mm x 279.4mm)
North American Legal (215.9mm x 355.6mm)
A4 (210mm x 297mm)
B4 (250mm x 353mm)
A3 (297mm x 420mm)
North American Letter (215.9mm x 279.4mm or 8.5"x11")
North American Legal (215.9mm x 355.6mm or 8.4"x14")
Unlimited
T.4 does not accurately define the maximum number of scan lines in a page. A wide
......@@ -162,7 +240,7 @@ typedef enum
Values seen for standard resolution A4 pages include 1037, 1045, 1109, 1126 and 1143.
1109 seems the most-popular. At fine res 2150, 2196, 2200, 2237, 2252-2262, 2264,
2286, and 2394 are used. 2255 seems the most popular. We try to use balanced choices
here.
here. 1143 pixels at 3.85/mm is 296.9mm, and an A4 page is 297mm long.
*/
typedef enum
{
......@@ -174,30 +252,38 @@ typedef enum
T4_LENGTH_600_A4 = 6998,
T4_LENGTH_800_A4 = 9330,
T4_LENGTH_1200_A4 = 13996,
/* B4 is 364mm long */
T4_LENGTH_STANDARD_B4 = 1401,
T4_LENGTH_FINE_B4 = 2802,
T4_LENGTH_300_B4 = 0,
T4_LENGTH_SUPERFINE_B4 = 5605,
T4_LENGTH_600_B4 = 0,
T4_LENGTH_800_B4 = 0,
T4_LENGTH_1200_B4 = 0,
/* B4 is 353mm long */
T4_LENGTH_STANDARD_B4 = 1359,
T4_LENGTH_FINE_B4 = 2718,
T4_LENGTH_300_B4 = 4169,
T4_LENGTH_SUPERFINE_B4 = 5436,
T4_LENGTH_600_B4 = 8338,
T4_LENGTH_800_B4 = 11118,
T4_LENGTH_1200_B4 = 16677,
/* A3 is 420mm long */
T4_LENGTH_STANDARD_A3 = 1617,
T4_LENGTH_FINE_A3 = 3234,
T4_LENGTH_300_A3 = 4960,
T4_LENGTH_SUPERFINE_A3 = 6468,
T4_LENGTH_600_A3 = 9921,
T4_LENGTH_800_A3 = 13228,
T4_LENGTH_1200_A3 = 19842,
/* North American letter is 279.4mm long */
T4_LENGTH_STANDARD_US_LETTER = 1075,
T4_LENGTH_FINE_US_LETTER = 2151,
T4_LENGTH_300_US_LETTER = 0,
T4_LENGTH_300_US_LETTER = 3300,
T4_LENGTH_SUPERFINE_US_LETTER = 4302,
T4_LENGTH_600_US_LETTER = 0,
T4_LENGTH_800_US_LETTER = 0,
T4_LENGTH_1200_US_LETTER = 0,
T4_LENGTH_600_US_LETTER = 6700,
T4_LENGTH_800_US_LETTER = 8800,
T4_LENGTH_1200_US_LETTER = 13200,
/* North American legal is 355.6mm long */
T4_LENGTH_STANDARD_US_LEGAL = 1369,
T4_LENGTH_FINE_US_LEGAL = 2738,
T4_LENGTH_300_US_LEGAL = 0,
T4_LENGTH_300_US_LEGAL = 4200,
T4_LENGTH_SUPERFINE_US_LEGAL = 5476,
T4_LENGTH_600_US_LEGAL = 0,
T4_LENGTH_800_US_LEGAL = 0,
T4_LENGTH_1200_US_LEGAL = 0
T4_LENGTH_600_US_LEGAL = 8400,
T4_LENGTH_800_US_LEGAL = 11200,
T4_LENGTH_1200_US_LEGAL = 16800
} t4_image_length_t;
/*! Return values from the T.85 decoder */
......
libs/spandsp/src/t30.c
浏览文件 @ 1757331e
差异被折叠。
libs/spandsp/src/t30_api.c
浏览文件 @ 1757331e
......@@ -650,11 +650,11 @@ SPAN_DECLARE(int) t30_set_rx_encoding(t30_state_t *s, int encoding)
{
switch (encoding)
{
case T4_COMPRESSION_ITU_T4_1D:
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
//case T4_COMPRESSION_ITU_T85:
//case T4_COMPRESSION_ITU_T85_L0:
case T4_COMPRESSION_T4_1D:
case T4_COMPRESSION_T4_2D:
case T4_COMPRESSION_T6:
//case T4_COMPRESSION_T85:
//case T4_COMPRESSION_T85_L0:
s->output_encoding = encoding;
return 0;
}
......@@ -696,15 +696,15 @@ SPAN_DECLARE(int) t30_set_supported_compressions(t30_state_t *s, int supported_c
int mask;
/* Mask out the ones we actually support today. */
mask = T30_SUPPORT_T4_1D_COMPRESSION
| T30_SUPPORT_T4_2D_COMPRESSION
| T30_SUPPORT_T6_COMPRESSION
//| T30_SUPPORT_T81_COMPRESSION
mask = T30_SUPPORT_COMPRESSION_T4_1D
| T30_SUPPORT_COMPRESSION_T4_2D
| T30_SUPPORT_COMPRESSION_T6
//| T30_SUPPORT_COMPRESSION_T81
#if defined(SPANDSP_SUPPORT_T43)
| T30_SUPPORT_T43_COMPRESSION
| T30_SUPPORT_COMPRESSION_T43
#endif
| T30_SUPPORT_T85_COMPRESSION
| T30_SUPPORT_T85_L0_COMPRESSION
| T30_SUPPORT_COMPRESSION_T85
| T30_SUPPORT_COMPRESSION_T85_L0
| 0;
s->supported_compressions = supported_compressions & mask;
t30_build_dis_or_dtc(s);
......
libs/spandsp/src/t4_rx.c
浏览文件 @ 1757331e
差异被折叠。
libs/spandsp/src/t4_t6_decode.c
浏览文件 @ 1757331e
......@@ -401,7 +401,7 @@ static int put_bits(t4_t6_decode_state_t *s, uint32_t bit_string, int quantity)
/* We have an EOL, so now the page begins and we can proceed to
process the bit stream as image data. */
s->consecutive_eols = 0;
if (s->encoding == T4_COMPRESSION_ITU_T4_1D)
if (s->encoding == T4_COMPRESSION_T4_1D)
{
s->row_is_2d = FALSE;
force_drop_rx_bits(s, 12);
......@@ -439,7 +439,7 @@ static int put_bits(t4_t6_decode_state_t *s, uint32_t bit_string, int quantity)
we should count up both EOLs, unless there is some bogus partial
row ahead of them. */
s->consecutive_eols++;
if (s->encoding == T4_COMPRESSION_ITU_T6)
if (s->encoding == T4_COMPRESSION_T6)
{
if (s->consecutive_eols >= EOLS_TO_END_T6_RX_PAGE)
{
......@@ -466,7 +466,7 @@ static int put_bits(t4_t6_decode_state_t *s, uint32_t bit_string, int quantity)
if (put_decoded_row(s))
return TRUE;
}
if (s->encoding == T4_COMPRESSION_ITU_T4_2D)
if (s->encoding == T4_COMPRESSION_T4_2D)
{
s->row_is_2d = !(s->rx_bitstream & 0x1000);
force_drop_rx_bits(s, 13);
......@@ -663,7 +663,7 @@ static int put_bits(t4_t6_decode_state_t *s, uint32_t bit_string, int quantity)
if (s->a0 >= s->image_width)
s->a0 = s->image_width - 1;
if (s->encoding == T4_COMPRESSION_ITU_T6)
if (s->encoding == T4_COMPRESSION_T6)
{
/* T.6 has no EOL markers. We sense the end of a line by its length alone. */
/* The last test here is a backstop protection, so a corrupt image cannot
......@@ -778,9 +778,9 @@ SPAN_DECLARE(int) t4_t6_decode_set_encoding(t4_t6_decode_state_t *s, int encodin
{
switch (encoding)
{
case T4_COMPRESSION_ITU_T4_1D:
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
case T4_COMPRESSION_T4_1D:
case T4_COMPRESSION_T4_2D:
case T4_COMPRESSION_T6:
s->encoding = encoding;
return 0;
}
......@@ -864,10 +864,10 @@ SPAN_DECLARE(int) t4_t6_decode_restart(t4_t6_decode_state_t *s, int image_width)
s->b1 = s->image_width;
s->a0 = 0;
s->run_length = 0;
s->row_is_2d = (s->encoding == T4_COMPRESSION_ITU_T6);
s->row_is_2d = (s->encoding == T4_COMPRESSION_T6);
/* We start at -1 EOLs for 1D and 2D decoding, as an indication we are waiting for the
first EOL. T.6 coding starts without any preamble. */
s->consecutive_eols = (s->encoding == T4_COMPRESSION_ITU_T6) ? 0 : -1;
s->consecutive_eols = (s->encoding == T4_COMPRESSION_T6) ? 0 : -1;
if (s->cur_runs)
memset(s->cur_runs, 0, run_space);
......
libs/spandsp/src/t4_t6_encode.c
浏览文件 @ 1757331e
......@@ -573,7 +573,7 @@ static void encode_eol(t4_t6_encode_state_t *s)
uint32_t code;
int length;
if (s->encoding == T4_COMPRESSION_ITU_T4_2D)
if (s->encoding == T4_COMPRESSION_T4_2D)
{
code = 0x0800 | ((!s->row_is_2d) << 12);
length = 13;
......@@ -589,7 +589,7 @@ static void encode_eol(t4_t6_encode_state_t *s)
/* We may need to pad the row to a minimum length, unless we are in T.6 mode.
In T.6 we only come here at the end of the page to add the EOFB marker, which
is like two 1D EOLs. */
if (s->encoding != T4_COMPRESSION_ITU_T6)
if (s->encoding != T4_COMPRESSION_T6)
{
if (s->row_bits + length < s->min_bits_per_row)
put_encoded_bits(s, 0, s->min_bits_per_row - (s->row_bits + length));
......@@ -823,14 +823,14 @@ static int encode_row(t4_t6_encode_state_t *s, const uint8_t *row_buf, size_t le
{
switch (s->encoding)
{
case T4_COMPRESSION_ITU_T6:
case T4_COMPRESSION_T6:
/* T.6 compression is a trivial step up from T.4 2D, so we just
throw it in here. T.6 is only used with error correction,
so it does not need independantly compressed (i.e. 1D) lines
to recover from data errors. It doesn't need EOLs, either. */
encode_2d_row(s, row_buf);
break;
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_T4_2D:
encode_eol(s);
if (s->row_is_2d)
{
......@@ -850,7 +850,7 @@ static int encode_row(t4_t6_encode_state_t *s, const uint8_t *row_buf, size_t le
}
break;
default:
case T4_COMPRESSION_ITU_T4_1D:
case T4_COMPRESSION_T4_1D:
encode_eol(s);
encode_1d_row(s, row_buf);
break;
......@@ -864,7 +864,7 @@ static int finalise_page(t4_t6_encode_state_t *s)
{
int i;
if (s->encoding == T4_COMPRESSION_ITU_T6)
if (s->encoding == T4_COMPRESSION_T6)
{
/* Attach an EOFB (end of facsimile block == 2 x EOLs) to the end of the page */
for (i = 0; i < EOLS_TO_END_T6_TX_PAGE; i++)
......@@ -982,9 +982,9 @@ SPAN_DECLARE(int) t4_t6_encode_set_encoding(t4_t6_encode_state_t *s, int encodin
{
switch (encoding)
{
case T4_COMPRESSION_ITU_T6:
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T4_1D:
case T4_COMPRESSION_T6:
case T4_COMPRESSION_T4_2D:
case T4_COMPRESSION_T4_1D:
s->encoding = encoding;
/* Set this to the default value for the lowest resolution in the T.4 spec. */
s->max_rows_to_next_1d_row = 2;
......@@ -1098,7 +1098,7 @@ SPAN_DECLARE(int) t4_t6_encode_restart(t4_t6_encode_state_t *s, int image_width)
{
/* Allow for pages being of different width. */
t4_t6_encode_set_image_width(s, image_width);
s->row_is_2d = (s->encoding == T4_COMPRESSION_ITU_T6);
s->row_is_2d = (s->encoding == T4_COMPRESSION_T6);
s->rows_to_next_1d_row = s->max_rows_to_next_1d_row - 1;
s->tx_bitstream = 0;
......
libs/spandsp/src/t4_tx.c
浏览文件 @ 1757331e
差异被折叠。
libs/spandsp/test-data/itu/fax/Makefile.am
浏览文件 @ 1757331e
......@@ -62,36 +62,48 @@ ITU_TEST_PAGES = itu1.tif \
test3.tif \
test4.tif
MIXED_SIZE_PAGES = R1200_1200_A4.tif \
R1200_1200_B4.tif \
R1200_1200_A3.tif \
R600_1200_A4.tif \
R600_1200_B4.tif \
R600_1200_A3.tif \
R600_600_A4.tif \
R600_600_B4.tif \
R600_600_A3.tif \
R16_800_A4.tif \
R16_800_B4.tif \
R16_800_A3.tif \
R16_154_A4.tif \
R16_154_B4.tif \
R16_154_A3.tif \
R300_600_A4.tif \
R300_600_B4.tif \
R300_600_A3.tif \
R300_300_A4.tif \
R300_300_B4.tif \
R300_300_A3.tif \
R8_154_A4.tif \
R8_154_B4.tif \
R8_154_A3.tif \
R8_77_A4.tif \
R8_77_B4.tif \
R8_77_A3.tif \
R8_385_A4.tif \
R8_385_B4.tif \
R8_385_A3.tif
MIXED_SIZE_PAGES = bilevel_1200_1200_A4.tif \
bilevel_1200_1200_B4.tif \
bilevel_1200_1200_A3.tif \
bilevel_600_1200_A4.tif \
bilevel_600_1200_B4.tif \
bilevel_600_1200_A3.tif \
bilevel_600_600_A4.tif \
bilevel_600_600_B4.tif \
bilevel_600_600_A3.tif \
bilevel_400_800_A4.tif \
bilevel_400_800_B4.tif \
bilevel_400_800_A3.tif \
bilevel_400_400_A4.tif \
bilevel_400_400_B4.tif \
bilevel_400_400_A3.tif \
bilevel_300_600_A4.tif \
bilevel_300_600_B4.tif \
bilevel_300_600_A3.tif \
bilevel_300_300_A4.tif \
bilevel_300_300_B4.tif \
bilevel_300_300_A3.tif \
bilevel_200_400_A4.tif \
bilevel_200_400_B4.tif \
bilevel_200_400_A3.tif \
bilevel_200_200_A4.tif \
bilevel_200_200_B4.tif \
bilevel_200_200_A3.tif \
bilevel_200_100_A4.tif \
bilevel_200_100_B4.tif \
bilevel_200_100_A3.tif \
bilevel_R16_154_A4.tif \
bilevel_R16_154_B4.tif \
bilevel_R16_154_A3.tif \
bilevel_R8_154_A4.tif \
bilevel_R8_154_B4.tif \
bilevel_R8_154_A3.tif \
bilevel_R8_77_A4.tif \
bilevel_R8_77_B4.tif \
bilevel_R8_77_A3.tif \
bilevel_R8_385_A4.tif \
bilevel_R8_385_B4.tif \
bilevel_R8_385_A3.tif
EXTRA_DIST = ${ITU_TEST_PAGES_PBM}
......
libs/spandsp/test-data/itu/fax/generate_dithered_tif.c
浏览文件 @ 1757331e
......@@ -93,10 +93,8 @@ int main(int argc, char *argv[])
/* Prepare the directory entry fully before writing the image, or libtiff complains */
TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, output_compression);
if (output_compression == COMPRESSION_CCITT_T4)
{
TIFFSetField(tiff_file, TIFFTAG_T4OPTIONS, output_t4_options);
TIFFSetField(tiff_file, TIFFTAG_FAXMODE, FAXMODE_CLASSF);
}
TIFFSetField(tiff_file, TIFFTAG_FAXMODE, FAXMODE_CLASSF);
TIFFSetField(tiff_file, TIFFTAG_IMAGEWIDTH, image_width);
TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
......
libs/spandsp/test-data/itu/fax/generate_sized_pages.c
浏览文件 @ 1757331e
......@@ -58,210 +58,294 @@ struct
} sequence[] =
{
{
"R8_385_A4.tif",
"bilevel_R8_385_A4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_STANDARD,
T4_WIDTH_R8_A4,
1100
},
{
"R8_385_B4.tif",
"bilevel_R8_385_B4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_STANDARD,
T4_WIDTH_R8_B4,
1200
},
{
"R8_385_A3.tif",
"bilevel_R8_385_A3.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_STANDARD,
T4_WIDTH_R8_A3,
1556
},
{
"R8_77_A4.tif",
"bilevel_R8_77_A4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_FINE,
T4_WIDTH_R8_A4,
1100*2
},
{
"R8_77_B4.tif",
"bilevel_R8_77_B4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_FINE,
T4_WIDTH_R8_B4,
1200*2
},
{
"R8_77_A3.tif",
"bilevel_R8_77_A3.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_FINE,
T4_WIDTH_R8_A3,
1556*2
},
{
"R8_154_A4.tif",
"bilevel_R8_154_A4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R8_A4,
1100*4
},
{
"R8_154_B4.tif",
"bilevel_R8_154_B4.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R8_B4,
1200*4
},
{
"R8_154_A3.tif",
"bilevel_R8_154_A3.tif",
T4_X_RESOLUTION_R8,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R8_A3,
1556*4
},
{
"R300_300_A4.tif",
"bilevel_R16_154_A4.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_A4,
1100*4
},
{
"bilevel_R16_154_B4.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_B4,
1200*4
},
{
"bilevel_R16_154_A3.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_A3,
1556*4
},
{
"bilevel_200_100_A4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_100,
T4_WIDTH_200_A4,
1100
},
{
"bilevel_200_100_B4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_100,
T4_WIDTH_200_B4,
1200
},
{
"bilevel_200_100_A3.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_100,
T4_WIDTH_200_A3,
1556
},
{
"bilevel_200_200_A4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_200,
T4_WIDTH_200_A4,
1100*2
},
{
"bilevel_200_200_B4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_200,
T4_WIDTH_200_B4,
1200*2
},
{
"bilevel_200_200_A3.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_200,
T4_WIDTH_200_A3,
1556*2
},
{
"bilevel_200_400_A4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_400,
T4_WIDTH_200_A4,
1100*4
},
{
"bilevel_200_400_B4.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_400,
T4_WIDTH_200_B4,
1200*4
},
{
"bilevel_200_400_A3.tif",
T4_X_RESOLUTION_200,
T4_Y_RESOLUTION_400,
T4_WIDTH_200_A3,
1556*4
},
{
"bilevel_300_300_A4.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_300,
T4_WIDTH_300_A4,
1100*3
},
{
"R300_300_B4.tif",
"bilevel_300_300_B4.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_300,
T4_WIDTH_300_B4,
1200*3
},
{
"R300_300_A3.tif",
"bilevel_300_300_A3.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_300,
T4_WIDTH_300_A3,
1556*3
},
{
"R300_600_A4.tif",
"bilevel_300_600_A4.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_600,
T4_WIDTH_300_A4,
1100*6
},
{
"R300_600_B4.tif",
"bilevel_300_600_B4.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_600,
T4_WIDTH_300_B4,
1200*6
},
{
"R300_600_A3.tif",
"bilevel_300_600_A3.tif",
T4_X_RESOLUTION_300,
T4_Y_RESOLUTION_600,
T4_WIDTH_300_A3,
1556*6
},
{
"R16_154_A4.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_A4,
"bilevel_400_400_A4.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_400,
T4_WIDTH_400_A4,
1100*4
},
{
"R16_154_B4.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_B4,
"bilevel_400_400_B4.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_400,
T4_WIDTH_400_B4,
1200*4
},
{
"R16_154_A3.tif",
T4_X_RESOLUTION_R16,
T4_Y_RESOLUTION_SUPERFINE,
T4_WIDTH_R16_A3,
"bilevel_400_400_A3.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_400,
T4_WIDTH_400_A3,
1556*4
},
{
"R16_800_A4.tif",
T4_X_RESOLUTION_R16,
"bilevel_400_800_A4.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_800,
T4_WIDTH_R16_A4,
T4_WIDTH_400_A4,
1100*8
},
{
"R16_800_B4.tif",
T4_X_RESOLUTION_R16,
"bilevel_400_800_B4.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_800,
T4_WIDTH_R16_B4,
T4_WIDTH_400_B4,
1200*8
},
{
"R16_800_A3.tif",
T4_X_RESOLUTION_R16,
"bilevel_400_800_A3.tif",
T4_X_RESOLUTION_400,
T4_Y_RESOLUTION_800,
T4_WIDTH_R16_A3,
T4_WIDTH_400_A3,
1556*8
},
{
"R600_600_A4.tif",
"bilevel_600_600_A4.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_600,
T4_WIDTH_600_A4,
1100*6
},
{
"R600_600_B4.tif",
"bilevel_600_600_B4.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_600,
T4_WIDTH_600_B4,
1200*6
},
{
"R600_600_A3.tif",
"bilevel_600_600_A3.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_600,
T4_WIDTH_600_A3,
1556*6
},
{
"R600_1200_A4.tif",
"bilevel_600_1200_A4.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_1200,
T4_WIDTH_600_A4,
1100*12
},
{
"R600_1200_B4.tif",
"bilevel_600_1200_B4.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_1200,
T4_WIDTH_600_B4,
1200*12
},
{
"R600_1200_A3.tif",
"bilevel_600_1200_A3.tif",
T4_X_RESOLUTION_600,
T4_Y_RESOLUTION_1200,
T4_WIDTH_600_A3,
1556*12
},
{
"R1200_1200_A4.tif",
"bilevel_1200_1200_A4.tif",
T4_X_RESOLUTION_1200,
T4_Y_RESOLUTION_1200,
T4_WIDTH_1200_A4,
1100*12
},
{
"R1200_1200_B4.tif",
"bilevel_1200_1200_B4.tif",
T4_X_RESOLUTION_1200,
T4_Y_RESOLUTION_1200,
T4_WIDTH_1200_B4,
1200*12
},
{
"R1200_1200_A3.tif",
"bilevel_1200_1200_A3.tif",
T4_X_RESOLUTION_1200,
T4_Y_RESOLUTION_1200,
T4_WIDTH_1200_A3,
......@@ -291,8 +375,10 @@ int main(int argc, char *argv[])
int compression;
int photo_metric;
int fill_order;
int output_t4_options;
compression = T4_COMPRESSION_ITU_T6;
compression = COMPRESSION_CCITT_T6;
output_t4_options = 0;
photo_metric = PHOTOMETRIC_MINISWHITE;
fill_order = FILLORDER_LSB2MSB;
while ((opt = getopt(argc, argv, "126ir")) != -1)
......@@ -300,13 +386,16 @@ int main(int argc, char *argv[])
switch (opt)
{
case '1':
compression = T4_COMPRESSION_ITU_T4_1D;
compression = COMPRESSION_CCITT_T4;
output_t4_options = GROUP3OPT_FILLBITS;
break;
case '2':
compression = T4_COMPRESSION_ITU_T4_2D;
compression = COMPRESSION_CCITT_T4;
output_t4_options = GROUP3OPT_FILLBITS | GROUP3OPT_2DENCODING;
break;
case '6':
compression = T4_COMPRESSION_ITU_T6;
compression = COMPRESSION_CCITT_T6;
output_t4_options = 0;
break;
case 'i':
photo_metric = PHOTOMETRIC_MINISBLACK;
......@@ -328,6 +417,9 @@ int main(int argc, char *argv[])
/* Prepare the directory entry fully before writing the image, or libtiff complains */
TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, compression);
if (output_t4_options)
TIFFSetField(tiff_file, TIFFTAG_T4OPTIONS, output_t4_options);
TIFFSetField(tiff_file, TIFFTAG_FAXMODE, FAXMODE_CLASSF);
TIFFSetField(tiff_file, TIFFTAG_IMAGEWIDTH, sequence[i].width);
TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1);
TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
......
libs/spandsp/tests/fax_decode.c
浏览文件 @ 1757331e
......@@ -97,7 +97,7 @@ int fast_trained = FAX_NONE;
uint8_t ecm_data[256][260];
int16_t ecm_len[256];
int line_encoding = T4_COMPRESSION_ITU_T4_1D;
int line_encoding = T4_COMPRESSION_T4_1D;
int x_resolution = T4_X_RESOLUTION_R8;
int y_resolution = T4_Y_RESOLUTION_STANDARD;
int image_width = 1728;
......@@ -221,11 +221,11 @@ static int check_rx_dcs(const uint8_t *msg, int len)
/* Check which compression we will use. */
if ((dcs_frame[6] & DISBIT7))
line_encoding = T4_COMPRESSION_ITU_T6;
line_encoding = T4_COMPRESSION_T6;
else if ((dcs_frame[4] & DISBIT8))
line_encoding = T4_COMPRESSION_ITU_T4_2D;
line_encoding = T4_COMPRESSION_T4_2D;
else
line_encoding = T4_COMPRESSION_ITU_T4_1D;
line_encoding = T4_COMPRESSION_T4_1D;
fprintf(stderr, "Selected compression %d\n", line_encoding);
if ((current_fallback = find_fallback_entry(dcs_frame[4] & (DISBIT6 | DISBIT5 | DISBIT4 | DISBIT3))) < 0)
......@@ -540,7 +540,7 @@ int main(int argc, char *argv[])
span_log_set_level(logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_SHOW_TAG | SPAN_LOG_FLOW);
#endif
if (t4_rx_init(&t4_rx_state, "fax_decode.tif", T4_COMPRESSION_ITU_T4_2D) == NULL)
if (t4_rx_init(&t4_rx_state, "fax_decode.tif", T4_COMPRESSION_T4_2D) == NULL)
{
fprintf(stderr, "Failed to init\n");
exit(0);
......
libs/spandsp/tests/fax_tests.c
浏览文件 @ 1757331e
......@@ -858,23 +858,23 @@ int main(int argc, char *argv[])
| T30_SUPPORT_300_600_RESOLUTION
| T30_SUPPORT_400_800_RESOLUTION
| T30_SUPPORT_600_1200_RESOLUTION);
//t30_set_rx_encoding(t30_state[i], T4_COMPRESSION_ITU_T85);
//t30_set_rx_encoding(t30_state[i], T4_COMPRESSION_T85);
t30_set_ecm_capability(t30_state[i], use_ecm);
if (use_ecm)
{
t30_set_supported_compressions(t30_state[i],
T30_SUPPORT_T4_1D_COMPRESSION
| T30_SUPPORT_T4_2D_COMPRESSION
| T30_SUPPORT_T6_COMPRESSION
//| T30_SUPPORT_T81_COMPRESSION
| T30_SUPPORT_T85_COMPRESSION
| T30_SUPPORT_T85_L0_COMPRESSION);
T30_SUPPORT_COMPRESSION_T4_1D
| T30_SUPPORT_COMPRESSION_T4_2D
| T30_SUPPORT_COMPRESSION_T6
//| T30_SUPPORT_COMPRESSION_T81
| T30_SUPPORT_COMPRESSION_T85
| T30_SUPPORT_COMPRESSION_T85_L0);
}
else
{
t30_set_supported_compressions(t30_state[i],
T30_SUPPORT_T4_1D_COMPRESSION
| T30_SUPPORT_T4_2D_COMPRESSION);
T30_SUPPORT_COMPRESSION_T4_1D
| T30_SUPPORT_COMPRESSION_T4_2D);
}
t30_set_minimum_scan_line_time(t30_state[i], scan_line_time);
......
libs/spandsp/tests/fax_tests.sh
浏览文件 @ 1757331e
......@@ -43,103 +43,143 @@ ITUTESTS_DIR=../test-data/itu/fax
for OPTS in "-p AA" "-p AA -e" "-p TT" "-p TT -e" "-p GG" "-p GG -e" "-p TG" "-p TG -e" "-p GT" "-p GT -e"
do
FILE="${ITUTESTS_DIR}/R8_385_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_385_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_385_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_385_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_385_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_385_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_77_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_77_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_77_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_77_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_77_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_77_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_154_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_154_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_154_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_154_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R8_154_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_R8_154_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_300_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R16_154_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_300_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_R16_154_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_300_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_R16_154_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_600_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_100_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_600_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_100_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R300_600_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_100_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_154_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_200_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_154_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_200_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_154_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_200_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_800_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_400_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_800_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_400_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R16_800_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_200_400_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_600_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_300_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_600_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_300_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_600_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_300_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_1200_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_600_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_1200_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_600_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R600_1200_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_300_600_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R1200_1200_A4.tif"
FILE="${ITUTESTS_DIR}/bilevel_400_400_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R1200_1200_B4.tif"
FILE="${ITUTESTS_DIR}/bilevel_400_400_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/R1200_1200_A3.tif"
FILE="${ITUTESTS_DIR}/bilevel_400_400_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_400_800_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_400_800_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_400_800_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_600_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_600_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_600_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_1200_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_1200_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_600_1200_A3.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_1200_1200_A4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_1200_1200_B4.tif"
run_fax_test
FILE="${ITUTESTS_DIR}/bilevel_1200_1200_A3.tif"
run_fax_test
done
......
libs/spandsp/tests/t38_decode.c
浏览文件 @ 1757331e
......@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'A');
t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'A');
t30_set_ecm_capability(t30, use_ecm);
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION | T30_SUPPORT_T85_COMPRESSION);
t30_set_supported_compressions(t30, T30_SUPPORT_COMPRESSION_T4_1D | T30_SUPPORT_COMPRESSION_T4_2D | T30_SUPPORT_COMPRESSION_T6 | T30_SUPPORT_COMPRESSION_T85);
if (pcap_scan_pkts(input_file_name, src_addr, src_port, dest_addr, dest_port, t38_terminal_timing_update, process_packet, NULL))
exit(2);
......@@ -497,7 +497,7 @@ int main(int argc, char *argv[])
t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'B');
t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'B');
t30_set_ecm_capability(t30, use_ecm);
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
t30_set_supported_compressions(t30, T30_SUPPORT_COMPRESSION_T4_1D | T30_SUPPORT_COMPRESSION_T4_2D | T30_SUPPORT_COMPRESSION_T6);
logging = fax_get_logging_state(fax_state);
span_log_set_level(logging, SPAN_LOG_DEBUG | SPAN_LOG_SHOW_TAG | SPAN_LOG_SHOW_SAMPLE_TIME);
......
libs/spandsp/tests/t4_t6_tests.c
浏览文件 @ 1757331e
......@@ -205,8 +205,8 @@ static int detect_page_end(int bit, int page_ended)
end_marks = 0;
eol_zeros = 11;
eol_ones = (page_ended == T4_COMPRESSION_ITU_T4_2D) ? 2 : 1;
expected_eols = (page_ended == T4_COMPRESSION_ITU_T6) ? 2 : 6;
eol_ones = (page_ended == T4_COMPRESSION_T4_2D) ? 2 : 1;
expected_eols = (page_ended == T4_COMPRESSION_T6) ? 2 : 6;
return 0;
}
......@@ -266,9 +266,9 @@ int main(int argc, char *argv[])
{
static const int compression_sequence[] =
{
T4_COMPRESSION_ITU_T4_1D,
T4_COMPRESSION_ITU_T4_2D,
T4_COMPRESSION_ITU_T6,
T4_COMPRESSION_T4_1D,
T4_COMPRESSION_T4_2D,
T4_COMPRESSION_T6,
-1
};
int bit;
......@@ -303,17 +303,17 @@ int main(int argc, char *argv[])
case 'c':
if (strcmp(optarg, "T41D") == 0)
{
compression = T4_COMPRESSION_ITU_T4_1D;
compression = T4_COMPRESSION_T4_1D;
compression_step = -1;
}
else if (strcmp(optarg, "T42D") == 0)
{
compression = T4_COMPRESSION_ITU_T4_2D;
compression = T4_COMPRESSION_T4_2D;
compression_step = -1;
}
else if (strcmp(optarg, "T6") == 0)
{
compression = T4_COMPRESSION_ITU_T6;
compression = T4_COMPRESSION_T6;
compression_step = -1;
}
break;
......
libs/spandsp/tests/t4_tests.c
浏览文件 @ 1757331e
......@@ -220,8 +220,8 @@ static int detect_page_end(int bit, int page_ended)
end_marks = 0;
eol_zeros = 11;
eol_ones = (page_ended == T4_COMPRESSION_ITU_T4_2D) ? 2 : 1;
expected_eols = (page_ended == T4_COMPRESSION_ITU_T6) ? 2 : 6;
eol_ones = (page_ended == T4_COMPRESSION_T4_2D) ? 2 : 1;
expected_eols = (page_ended == T4_COMPRESSION_T6) ? 2 : 6;
return 0;
}
......@@ -282,19 +282,19 @@ int main(int argc, char *argv[])
static const int compression_sequence[] =
{
//T4_COMPRESSION_NONE,
T4_COMPRESSION_ITU_T4_1D,
T4_COMPRESSION_ITU_T4_2D,
T4_COMPRESSION_ITU_T6,
T4_COMPRESSION_T4_1D,
T4_COMPRESSION_T4_2D,
T4_COMPRESSION_T6,
#if defined(SPANDSP_SUPPORT_T42x)
T4_COMPRESSION_ITU_T42,
T4_COMPRESSION_ITU_SYCC_T42,
T4_COMPRESSION_T42,
T4_COMPRESSION_SYCC_T42,
#endif
#if defined(SPANDSP_SUPPORT_T43x)
T4_COMPRESSION_ITU_T43,
T4_COMPRESSION_T43,
#endif
T4_COMPRESSION_ITU_T85,
T4_COMPRESSION_ITU_T85_L0,
//T4_COMPRESSION_ITU_T45,
T4_COMPRESSION_T85,
T4_COMPRESSION_T85_L0,
//T4_COMPRESSION_T45,
-1
};
int sends;
......@@ -353,36 +353,36 @@ int main(int argc, char *argv[])
case 'c':
if (strcmp(optarg, "T41D") == 0)
{
compression = T4_COMPRESSION_ITU_T4_1D;
compression = T4_COMPRESSION_T4_1D;
compression_step = -1;
}
else if (strcmp(optarg, "T42D") == 0)
{
compression = T4_COMPRESSION_ITU_T4_2D;
compression = T4_COMPRESSION_T4_2D;
compression_step = -1;
}
else if (strcmp(optarg, "T6") == 0)
{
compression = T4_COMPRESSION_ITU_T6;
compression = T4_COMPRESSION_T6;
compression_step = -1;
}
#if defined(SPANDSP_SUPPORT_T42)
else if (strcmp(optarg, "T42") == 0)
{
compression = T4_COMPRESSION_ITU_T42;
compression = T4_COMPRESSION_T42;
compression_step = -1;
}
#endif
#if defined(SPANDSP_SUPPORT_T43)
else if (strcmp(optarg, "T43") == 0)
{
compression = T4_COMPRESSION_ITU_T43;
compression = T4_COMPRESSION_T43;
compression_step = -1;
}
#endif
else if (strcmp(optarg, "T85") == 0)
{
compression = T4_COMPRESSION_ITU_T85;
compression = T4_COMPRESSION_T85;
compression_step = -1;
}
break;
......@@ -426,9 +426,9 @@ int main(int argc, char *argv[])
if (decode_file_name)
{
if (compression < 0)
compression = T4_COMPRESSION_ITU_T4_1D;
compression = T4_COMPRESSION_T4_1D;
/* Receive end puts TIFF to a new file. We assume the receive width here. */
if ((receive_state = t4_rx_init(NULL, OUT_FILE_NAME, T4_COMPRESSION_ITU_T4_2D)) == NULL)
if ((receive_state = t4_rx_init(NULL, OUT_FILE_NAME, T4_COMPRESSION_T4_2D)) == NULL)
{
printf("Failed to init T.4 rx\n");
exit(2);
......@@ -548,7 +548,7 @@ int main(int argc, char *argv[])
t4_tx_set_max_2d_rows_per_1d_row(send_state, 2);
/* Receive end puts TIFF to a function. */
if ((receive_state = t4_rx_init(NULL, NULL, T4_COMPRESSION_ITU_T4_2D)) == NULL)
if ((receive_state = t4_rx_init(NULL, NULL, T4_COMPRESSION_T4_2D)) == NULL)
{
printf("Failed to init T.4 rx\n");
exit(2);
......@@ -670,7 +670,7 @@ int main(int argc, char *argv[])
t4_tx_set_local_ident(send_state, "111 2222 3333");
/* Receive end puts TIFF to a new file. */
if ((receive_state = t4_rx_init(NULL, OUT_FILE_NAME, T4_COMPRESSION_ITU_T4_2D)) == NULL)
if ((receive_state = t4_rx_init(NULL, OUT_FILE_NAME, T4_COMPRESSION_T4_2D)) == NULL)
{
printf("Failed to init T.4 rx for '%s'\n", OUT_FILE_NAME);
exit(2);
......
libs/spandsp/tests/tsb85_tests.c
浏览文件 @ 1757331e
......@@ -406,7 +406,7 @@ static void fax_prepare(void)
| T30_SUPPORT_400_800_RESOLUTION
| T30_SUPPORT_600_1200_RESOLUTION);
t30_set_supported_modems(t30, T30_SUPPORT_V27TER | T30_SUPPORT_V29 | T30_SUPPORT_V17);
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
t30_set_supported_compressions(t30, T30_SUPPORT_COMPRESSION_T4_1D | T30_SUPPORT_COMPRESSION_T4_2D | T30_SUPPORT_COMPRESSION_T6);
t30_set_phase_b_handler(t30, phase_b_handler, (void *) (intptr_t) 'A');
t30_set_phase_d_handler(t30, phase_d_handler, (void *) (intptr_t) 'A');
t30_set_phase_e_handler(t30, phase_e_handler, (void *) (intptr_t) 'A');
......@@ -879,7 +879,7 @@ static int next_step(faxtester_state_t *s)
t30 = fax_get_t30_state(fax);
t30_set_rx_file(t30, output_tiff_file_name, -1);
/* Avoid libtiff 3.8.2 and earlier bug on complex 2D lines. */
t30_set_rx_encoding(t30, T4_COMPRESSION_ITU_T4_1D);
t30_set_rx_encoding(t30, T4_COMPRESSION_T4_1D);
if (value)
{
sprintf(path, "%s/%s", image_path, (const char *) value);
......@@ -894,7 +894,7 @@ static int next_step(faxtester_state_t *s)
next_tx_file[0] = '\0';
t30 = fax_get_t30_state(fax);
/* Avoid libtiff 3.8.2 and earlier bug on complex 2D lines. */
t30_set_rx_encoding(t30, T4_COMPRESSION_ITU_T4_1D);
t30_set_rx_encoding(t30, T4_COMPRESSION_T4_1D);
if (value)
{
sprintf(path, "%s/%s", image_path, (const char *) value);
......@@ -969,13 +969,13 @@ static int next_step(faxtester_state_t *s)
exit(2);
}
t4_tx_set_header_info(&t4_tx_state, NULL);
compression_type = T4_COMPRESSION_ITU_T4_1D;
compression_type = T4_COMPRESSION_T4_1D;
if (compression)
{
if (strcasecmp((const char *) compression, "T.4 2D") == 0)
compression_type = T4_COMPRESSION_ITU_T4_2D;
compression_type = T4_COMPRESSION_T4_2D;
else if (strcasecmp((const char *) compression, "T.6") == 0)
compression_type = T4_COMPRESSION_ITU_T6;
compression_type = T4_COMPRESSION_T6;
}
t4_tx_set_tx_encoding(&t4_tx_state, compression_type);
t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits);
......@@ -1009,13 +1009,13 @@ static int next_step(faxtester_state_t *s)
exit(2);
}
t4_tx_set_header_info(&t4_tx_state, NULL);
compression_type = T4_COMPRESSION_ITU_T4_1D;
compression_type = T4_COMPRESSION_T4_1D;
if (compression)
{
if (strcasecmp((const char *) compression, "T.4 2D") == 0)
compression_type = T4_COMPRESSION_ITU_T4_2D;
compression_type = T4_COMPRESSION_T4_2D;
else if (strcasecmp((const char *) compression, "T.6") == 0)
compression_type = T4_COMPRESSION_ITU_T6;
compression_type = T4_COMPRESSION_T6;
}
t4_tx_set_tx_encoding(&t4_tx_state, compression_type);
t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits);
......
src/mod/applications/mod_spandsp/mod_spandsp_fax.c
浏览文件 @ 1757331e
......@@ -888,11 +888,11 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
}
if (pvt->use_ecm) {
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION | T30_SUPPORT_T85_COMPRESSION | T30_SUPPORT_T85_L0_COMPRESSION);
t30_set_supported_compressions(t30, T30_SUPPORT_COMPRESSION_T4_1D | T30_SUPPORT_COMPRESSION_T4_2D | T30_SUPPORT_COMPRESSION_T6 | T30_SUPPORT_COMPRESSION_T85 | T30_SUPPORT_COMPRESSION_T85_L0);
t30_set_ecm_capability(t30, TRUE);
switch_channel_set_variable(channel, "fax_ecm_requested", "1");
} else {
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION);
t30_set_supported_compressions(t30, T30_SUPPORT_COMPRESSION_T4_1D | T30_SUPPORT_COMPRESSION_T4_2D);
switch_channel_set_variable(channel, "fax_ecm_requested", "0");
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论