kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A couple of typos in spandsp 

Improvements to image flattening in spandsp's image translate code
This commit is contained in:
Steve Underwood 2012-08-09 21:58:22 +08:00
parent a4115a099b
commit d1b45ae65b
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/spandsp/src/image_translate.c
View File

@ -163,10 +163,9 @@ static int image_gray16_to_colour16_row(uint16_t colour16[], uint16_t gray16[],
for (i = pixels - 1; i >= 0; i--) for (i = pixels - 1; i >= 0; i--)
{ {
/* TODO: need to balance the colours */ colour16[3*i] = saturateu16((gray16[i]*36532) >> 15);
colour16[3*i] = gray16[i]; colour16[3*i + 1] = saturateu16((gray16[i]*37216) >> 16);
colour16[3*i + 1] = gray16[i]; colour16[3*i + 2] = saturateu16((gray16[i]*47900) >> 14);
colour16[3*i + 2] = gray16[i];
} }
return pixels; return pixels;
} }
@ -178,10 +177,9 @@ static int image_gray16_to_colour8_row(uint8_t colour8[], uint16_t gray16[], int
for (i = pixels - 1; i >= 0; i--) for (i = pixels - 1; i >= 0; i--)
{ {
/* TODO: need to balance the colours */ colour8[3*i] = saturateu8((gray16[i]*36532) >> 23);
colour8[3*i] = gray16[i] >> 8; colour8[3*i + 1] = saturateu8((gray16[i]*37216) >> 24);
colour8[3*i + 1] = gray16[i] >> 8; colour8[3*i + 2] = saturateu8((gray16[i]*47900) >> 22);
colour8[3*i + 2] = gray16[i] >> 8;
} }
return pixels; return pixels;
} }
@ -530,7 +528,7 @@ SPAN_DECLARE(int) image_translate_row(image_translate_state_t *s, uint8_t buf[],
else else
{ {
i = s->output_width*s->output_bytes_per_pixel; i = s->output_width*s->output_bytes_per_pixel;
memcpy(buf, s->pixel_row[1], i); memcpy(buf, s->pixel_row[0], i);
} }
return i; return i;
} }

2
libs/spandsp/src/spandsp/ima_adpcm.h
View File

@ -1,7 +1,7 @@
/* /*
* SpanDSP - a series of DSP components for telephony * SpanDSP - a series of DSP components for telephony
* *
* ima_adpcm.c - Conversion routines between linear 16 bit PCM data and * ima_adpcm.h - Conversion routines between linear 16 bit PCM data and
* IMA/DVI/Intel ADPCM format. * IMA/DVI/Intel ADPCM format.
* *
* Written by Steve Underwood <steveu@coppice.org> * Written by Steve Underwood <steveu@coppice.org>

2
libs/spandsp/src/spandsp/private/ima_adpcm.h
View File

@ -1,7 +1,7 @@
/* /*
* SpanDSP - a series of DSP components for telephony * SpanDSP - a series of DSP components for telephony
* *
* private/ima_adpcm.c - Conversion routines between linear 16 bit PCM data * private/ima_adpcm.h - Conversion routines between linear 16 bit PCM data
* and IMA/DVI/Intel ADPCM format. * and IMA/DVI/Intel ADPCM format.
* *
* Written by Steve Underwood <steveu@coppice.org> * Written by Steve Underwood <steveu@coppice.org>