ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-02 01:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some tweaks to spandsp tests. Make spandsp write TIFF files more like the

Browse Source 
TIFF/FX spec says, even though no software seems to care.
This commit is contained in:
Steve Underwood committed 2012-09-07 00:41:41 +08:00
1 parent 4cb0e2e5bd
commit cc73cb6544
7 files changed
+36 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/spandsp/src/t31.c
+17 -17
View File
@@ -1689,6 +1689,16 @@ static int restart_modem(t31_state_t *s, int new_modem)
}
s->at_state.transmit = TRUE;
break;
case FAX_MODEM_V21_RX:
if (s->t38_mode)
{
}
else
{
t31_v21_rx(s);
fax_modems_set_rx_handler(t, (span_rx_handler_t) &fsk_rx, &t->v21_rx, (span_rx_fillin_handler_t) &fsk_rx_fillin, &t->v21_rx);
}
break;
case FAX_MODEM_V21_TX:
if (s->t38_mode)
{
@@ -1712,15 +1722,16 @@ static int restart_modem(t31_state_t *s, int new_modem)
s->dled = FALSE;
s->at_state.transmit = TRUE;
break;
case FAX_MODEM_V21_RX:
if (s->t38_mode)
{
}
else
case FAX_MODEM_V17_RX:
case FAX_MODEM_V27TER_RX:
case FAX_MODEM_V29_RX:
if (!s->t38_mode)
{
fax_modems_start_fast_modem(t, s->modem, s->bit_rate, s->short_train, use_hdlc);
/* Allow for +FCERROR/+FRH:3 */
t31_v21_rx(s);
fax_modems_set_rx_handler(t, (span_rx_handler_t) &fsk_rx, &t->v21_rx, (span_rx_fillin_handler_t) &fsk_rx_fillin, &t->v21_rx);
}
s->at_state.transmit = FALSE;
break;
case FAX_MODEM_V17_TX:
if (s->t38_mode)
@@ -1755,17 +1766,6 @@ static int restart_modem(t31_state_t *s, int new_modem)
s->tx.data_started = FALSE;
s->at_state.transmit = TRUE;
break;
case FAX_MODEM_V17_RX:
case FAX_MODEM_V27TER_RX:
case FAX_MODEM_V29_RX:
if (!s->t38_mode)
{
fax_modems_start_fast_modem(t, s->modem, s->bit_rate, s->short_train, use_hdlc);
/* Allow for +FCERROR/+FRH:3 */
t31_v21_rx(s);
}
s->at_state.transmit = FALSE;
break;
case FAX_MODEM_V27TER_TX:
if (s->t38_mode)
{
libs/spandsp/src/t4_rx.c
+8 -4
View File
@@ -172,7 +172,7 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
}
#if defined(SPANDSP_SUPPORT_TIFF_FX)
TIFFSetField(t->tiff_file, TIFFTAG_PROFILETYPE, PROFILETYPE_G3_FAX);
TIFFSetField(t->tiff_file, TIFFTAG_FAXPROFILE, FAXPROFILE_S);
TIFFSetField(t->tiff_file, TIFFTAG_FAXPROFILE, FAXPROFILE_F);
TIFFSetField(t->tiff_file, TIFFTAG_CODINGMETHODS, CODINGMETHODS_T4_1D | CODINGMETHODS_T4_2D | CODINGMETHODS_T6);
TIFFSetField(t->tiff_file, TIFFTAG_VERSIONYEAR, "1998");
/* TIFFSetField(t->tiff_file, TIFFTAG_MODENUMBER, 0); */
@@ -304,10 +304,14 @@ static int write_tiff_image(t4_rx_state_t *s)
return -1;
/* Set up the TIFF directory info... */
set_tiff_directory_info(s);
/* ...and then write the image... */
/* ...Put the directory in the file before the image data, to get them in the order specified
for TIFF/F files... */
if (!TIFFCheckpointDirectory(t->tiff_file))
span_log(&s->logging, SPAN_LOG_WARNING, "%s: Failed to checkpoint directory for page %d.\n", t->file, s->current_page);
/* ...and write out the image... */
if (TIFFWriteEncodedStrip(t->tiff_file, 0, t->image_buffer, t->image_size) < 0)
span_log(&s->logging, SPAN_LOG_WARNING, "%s: Error writing TIFF strip.\n", t->file);
/* ...then the directory entry, and libtiff is happy. */
/* ...then finalise the directory entry, and libtiff is happy. */
if (!TIFFWriteDirectory(t->tiff_file))
span_log(&s->logging, SPAN_LOG_WARNING, "%s: Failed to write directory for page %d.\n", t->file, s->current_page);
#if defined(SPANDSP_SUPPORT_TIFF_FX)
@@ -316,7 +320,7 @@ static int write_tiff_image(t4_rx_state_t *s)
if (!TIFFCreateCustomDirectory(t->tiff_file, &tiff_fx_field_array))
{
TIFFSetField(t->tiff_file, TIFFTAG_FAXPROFILE, PROFILETYPE_G3_FAX);
TIFFSetField(t->tiff_file, TIFFTAG_PROFILETYPE, FAXPROFILE_S);
TIFFSetField(t->tiff_file, TIFFTAG_PROFILETYPE, FAXPROFILE_F);
TIFFSetField(t->tiff_file, TIFFTAG_VERSIONYEAR, "1998");
offset = 0;