Skip to content

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

A cleanup of FAX image size/resolution matching accuracy. Squashing of bi-level 

images should now be correct. This is now close to supporting grey scale and
colour.
上级 13e85323
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1851 行增加 和 757 行删除
libs/spandsp/INSTALL
浏览文件 @ df669f70
差异被折叠。
libs/spandsp/spandsp-sim/Makefile.am
浏览文件 @ df669f70
...@@ -34,7 +34,7 @@ EXTRA_DIST = libspandsp_sim.dsp \ ...@@ -34,7 +34,7 @@ EXTRA_DIST = libspandsp_sim.dsp \
msvc/vc9proj.head \ msvc/vc9proj.head \
msvc/vc9proj.foot msvc/vc9proj.foot
INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -DDATADIR="\"$(pkgdatadir)\"" AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src -DDATADIR="\"$(pkgdatadir)\""
noinst_PROGRAMS = make_line_models noinst_PROGRAMS = make_line_models
......
libs/spandsp/src/Makefile.am
浏览文件 @ df669f70
...@@ -78,7 +78,7 @@ EXTRA_DIST = floating_fudge.h \ ...@@ -78,7 +78,7 @@ EXTRA_DIST = floating_fudge.h \
spandsp/private/README \ spandsp/private/README \
spandsp/version.h.in spandsp/version.h.in
INCLUDES = -I$(top_builddir) AM_CPPFLAGS = -I$(top_builddir)
lib_LTLIBRARIES = libspandsp.la lib_LTLIBRARIES = libspandsp.la
......
libs/spandsp/src/spandsp/t4_tx.h
浏览文件 @ df669f70
...@@ -323,12 +323,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_image_format(t4_tx_state_t *s, ...@@ -323,12 +323,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_image_format(t4_tx_state_t *s,
int supported_bilevel_resolutions, int supported_bilevel_resolutions,
int supported_colour_resolutions); int supported_colour_resolutions);
/*! \brief Set the compression for the encoded data.
\param s The T.4 context.
\param encoding The encoding.
\return 0 for success, otherwise -1. */
SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding);
/*! \brief Set the minimum number of encoded bits per row. This allows the /*! \brief Set the minimum number of encoded bits per row. This allows the
makes the encoding process to be set to comply with the minimum row makes the encoding process to be set to comply with the minimum row
time specified by a remote receiving machine. time specified by a remote receiving machine.
...@@ -336,11 +330,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding); ...@@ -336,11 +330,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding);
\param bits The minimum number of bits per row. */ \param bits The minimum number of bits per row. */
SPAN_DECLARE(void) t4_tx_set_min_bits_per_row(t4_tx_state_t *s, int bits); SPAN_DECLARE(void) t4_tx_set_min_bits_per_row(t4_tx_state_t *s, int bits);
/*! \brief Set the width of the image.
\param s The T.4 context.
\param image_width The image width, in pixels. */
SPAN_DECLARE(void) t4_tx_set_image_width(t4_tx_state_t *s, int image_width);
/*! \brief Set the maximum number of 2D encoded rows between 1D encoded rows. This /*! \brief Set the maximum number of 2D encoded rows between 1D encoded rows. This
is only valid for T.4 2D encoding. is only valid for T.4 2D encoding.
\param s The T.4 context. \param s The T.4 context.
...@@ -381,12 +370,6 @@ SPAN_DECLARE(void) t4_tx_set_header_overlays_image(t4_tx_state_t *s, int header_ ...@@ -381,12 +370,6 @@ SPAN_DECLARE(void) t4_tx_set_header_overlays_image(t4_tx_state_t *s, int header_
\return 0 for success, otherwise -1. */ \return 0 for success, otherwise -1. */
SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_tx_state_t *s, t4_row_read_handler_t handler, void *user_data); SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_tx_state_t *s, t4_row_read_handler_t handler, void *user_data);
/*! \brief Set the row squashing ratio, for adjusting row-to-row (y) resolution of bi-level
images for a T.4 transmit context.
\param s The T.4 transmit context.
\param row_squashing_ratio Vertical squashing ratio. */
SPAN_DECLARE(void) t4_tx_set_row_squashing_ratio(t4_tx_state_t *s, int row_squashing_ratio);
/*! \brief Get the number of pages in the file. /*! \brief Get the number of pages in the file.
\param s The T.4 context. \param s The T.4 context.
\return The number of pages, or -1 if there is an error. */ \return The number of pages, or -1 if there is an error. */
......
libs/spandsp/src/t30.c
浏览文件 @ df669f70
差异被折叠。
libs/spandsp/src/t4_rx.c
浏览文件 @ df669f70
差异被折叠。
libs/spandsp/src/t4_tx.c
浏览文件 @ df669f70
差异被折叠。
libs/spandsp/tests/Makefile.am
浏览文件 @ df669f70
...@@ -46,7 +46,7 @@ EXTRA_DIST = fax_tests.sh \ ...@@ -46,7 +46,7 @@ EXTRA_DIST = fax_tests.sh \
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/spandsp-sim -DDATADIR="\"$(pkgdatadir)\"" AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/spandsp-sim -DDATADIR="\"$(pkgdatadir)\""
LIBDIR = -L$(top_builddir)/src LIBDIR = -L$(top_builddir)/src
......
libs/spandsp/tests/regression_tests.sh
浏览文件 @ df669f70
...@@ -43,6 +43,15 @@ then ...@@ -43,6 +43,15 @@ then
fi fi
echo adsi_tests completed OK echo adsi_tests completed OK
./alloc_tests >$STDOUT_DEST 2>$STDERR_DEST
RETVAL=$?
if [ $RETVAL != 0 ]
then
echo alloc_tests failed!
exit $RETVAL
fi
echo alloc_tests completed OK
./async_tests >$STDOUT_DEST 2>$STDERR_DEST ./async_tests >$STDOUT_DEST 2>$STDERR_DEST
RETVAL=$? RETVAL=$?
if [ $RETVAL != 0 ] if [ $RETVAL != 0 ]
......
libs/spandsp/tests/t31_tests.c
浏览文件 @ df669f70
...@@ -106,9 +106,9 @@ static const struct command_response_s fax_send_test_seq[] = ...@@ -106,9 +106,9 @@ static const struct command_response_s fax_send_test_seq[] =
EXCHANGE("AT+FRH=3\r", "\r\nCONNECT\r\n"), EXCHANGE("AT+FRH=3\r", "\r\nCONNECT\r\n"),
//<DIS frame data> //<DIS frame data>
#if 1 #if 1
RESPONSE("\xFF\x13\x80\x00\xEE\xF8\x80\x80\x89\x80\x80\x80\x18\x18\xB9\x10\x03"), // For audio FAXing RESPONSE("\xFF\x13\x80\x00\xEE\xF8\x80\x80\x99\x80\x80\x80\x18\x58\x0D\x10\x03"), // For audio FAXing
#else #else
RESPONSE("\xFF\x13\x80\x04\xEE\xF8\x80\x80\x89\x80\x80\x80\x18\x84\x09\x10\x03"), // For T.38 FAXing RESPONSE("\xFF\x13\x80\x04\xEE\xF8\x80\x80\x99\x80\x80\x80\x18\xC4\xBD\x10\x03"), // For T.38 FAXing
#endif #endif
RESPONSE("\r\nOK\r\n"), RESPONSE("\r\nOK\r\n"),
//EXCHANGE("AT+FRH=3\r", "\r\nNO CARRIER\r\n"), //EXCHANGE("AT+FRH=3\r", "\r\nNO CARRIER\r\n"),
......
libs/spandsp/tests/t4_tests.c
浏览文件 @ df669f70
...@@ -518,7 +518,6 @@ int main(int argc, char *argv[]) ...@@ -518,7 +518,6 @@ int main(int argc, char *argv[])
compression = compression_sequence[compression_step++]; compression = compression_sequence[compression_step++];
} }
} }
#if 0
if (t4_tx_set_tx_image_format(send_state, if (t4_tx_set_tx_image_format(send_state,
compression, compression,
T4_SUPPORT_WIDTH_215MM T4_SUPPORT_WIDTH_215MM
...@@ -548,8 +547,6 @@ int main(int argc, char *argv[]) ...@@ -548,8 +547,6 @@ int main(int argc, char *argv[])
{ {
break; break;
} }
#endif
t4_tx_set_tx_encoding(send_state, compression);
t4_rx_set_rx_encoding(receive_state, compression); t4_rx_set_rx_encoding(receive_state, compression);
if (t4_tx_start_page(send_state)) if (t4_tx_start_page(send_state))
......
libs/spandsp/tests/tsb85_tests.c
浏览文件 @ df669f70
...@@ -397,6 +397,7 @@ static void fax_prepare(void) ...@@ -397,6 +397,7 @@ static void fax_prepare(void)
| T4_RESOLUTION_R8_FINE | T4_RESOLUTION_R8_FINE
| T4_RESOLUTION_R8_SUPERFINE | T4_RESOLUTION_R8_SUPERFINE
| T4_RESOLUTION_R16_SUPERFINE | T4_RESOLUTION_R16_SUPERFINE
| T4_RESOLUTION_100_100
| T4_RESOLUTION_200_100 | T4_RESOLUTION_200_100
| T4_RESOLUTION_200_200 | T4_RESOLUTION_200_200
| T4_RESOLUTION_200_400 | T4_RESOLUTION_200_400
...@@ -980,7 +981,37 @@ static int next_step(faxtester_state_t *s) ...@@ -980,7 +981,37 @@ static int next_step(faxtester_state_t *s)
else if (strcasecmp((const char *) compression, "T.6") == 0) else if (strcasecmp((const char *) compression, "T.6") == 0)
compression_type = T4_COMPRESSION_T6; compression_type = T4_COMPRESSION_T6;
} }
t4_tx_set_tx_encoding(&t4_tx_state, compression_type); if (t4_tx_set_tx_image_format(&t4_tx_state,
compression_type,
T4_SUPPORT_WIDTH_215MM
| T4_SUPPORT_LENGTH_US_LETTER
| T4_SUPPORT_LENGTH_US_LEGAL
| T4_SUPPORT_LENGTH_UNLIMITED,
T4_RESOLUTION_R8_STANDARD
| T4_RESOLUTION_R8_FINE
| T4_RESOLUTION_R8_SUPERFINE
| T4_RESOLUTION_R16_SUPERFINE
| T4_RESOLUTION_200_100
| T4_RESOLUTION_200_200
| T4_RESOLUTION_200_400
| T4_RESOLUTION_300_300
| T4_RESOLUTION_300_600
| T4_RESOLUTION_400_400
| T4_RESOLUTION_400_800
| T4_RESOLUTION_600_600
| T4_RESOLUTION_600_1200
| T4_RESOLUTION_1200_1200,
T4_RESOLUTION_100_100
| T4_RESOLUTION_200_200
| T4_RESOLUTION_300_300
| T4_RESOLUTION_400_400
| T4_RESOLUTION_600_600
| T4_RESOLUTION_1200_1200) < 0)
{
span_log(&s->logging, SPAN_LOG_FLOW, "Failed to set T.4 compression\n");
printf("Test failed\n");
exit(2);
}
t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits); t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits);
if (t4_tx_start_page(&t4_tx_state)) if (t4_tx_start_page(&t4_tx_state))
{ {
...@@ -1020,7 +1051,37 @@ static int next_step(faxtester_state_t *s) ...@@ -1020,7 +1051,37 @@ static int next_step(faxtester_state_t *s)
else if (strcasecmp((const char *) compression, "T.6") == 0) else if (strcasecmp((const char *) compression, "T.6") == 0)
compression_type = T4_COMPRESSION_T6; compression_type = T4_COMPRESSION_T6;
} }
t4_tx_set_tx_encoding(&t4_tx_state, compression_type); if (t4_tx_set_tx_image_format(&t4_tx_state,
compression_type,
T4_SUPPORT_WIDTH_215MM
| T4_SUPPORT_LENGTH_US_LETTER
| T4_SUPPORT_LENGTH_US_LEGAL
| T4_SUPPORT_LENGTH_UNLIMITED,
T4_RESOLUTION_R8_STANDARD
| T4_RESOLUTION_R8_FINE
| T4_RESOLUTION_R8_SUPERFINE
| T4_RESOLUTION_R16_SUPERFINE
| T4_RESOLUTION_200_100
| T4_RESOLUTION_200_200
| T4_RESOLUTION_200_400
| T4_RESOLUTION_300_300
| T4_RESOLUTION_300_600
| T4_RESOLUTION_400_400
| T4_RESOLUTION_400_800
| T4_RESOLUTION_600_600
| T4_RESOLUTION_600_1200
| T4_RESOLUTION_1200_1200,
T4_RESOLUTION_100_100
| T4_RESOLUTION_200_200
| T4_RESOLUTION_300_300
| T4_RESOLUTION_400_400
| T4_RESOLUTION_600_600
| T4_RESOLUTION_1200_1200) < 0)
{
span_log(&s->logging, SPAN_LOG_FLOW, "Failed to set T.4 compression\n");
printf("Test failed\n");
exit(2);
}
t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits); t4_tx_set_min_bits_per_row(&t4_tx_state, min_row_bits);
if (t4_tx_start_page(&t4_tx_state)) if (t4_tx_start_page(&t4_tx_state))
{ {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论