Skip to content

two small fixes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

two small fixes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af30d9d
fix G722 saturation
Sep 7, 2020
43d3ea4
fix crosscompile - looking in host dirs
Sep 7, 2020
b7f351b
fix saturation patch
Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ AC_TRY_COMPILE([#include <libxml/xmlmemory.h>], [int a = 1;],
# Hunt through several possible directories to find the includes for libxml2
if test "x$XML2_INCLUDE" = "x"; then
old_CPPFLAGS="$CPPFLAGS"
for i in $xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2 ; do
for i in $xml2_include_dir ${prefix}/usr/include ${prefix}/usr/local/include ${prefix}/usr/include/libxml2 ${prefix}/usr/local/include/libxml2 ; do
CPPFLAGS="$old_CPPFLAGS -I$i"
AC_TRY_COMPILE([#include <libxml/xmlmemory.h>], [int a = 1;],
XML2_INCLUDE="-I$i",
Expand Down
6 changes: 3 additions & 3 deletions src/g722.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,13 +415,13 @@ SPAN_DECLARE(int) g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8
if (s->eight_k)
{
/* We shift by 1 to allow for the 15 bit input to the G.722 algorithm. */
amp[outlen++] = (int16_t) (rlow << 1);
amp[outlen++] = saturate16 (rlow << 1);
}
else
{
/* Apply the QMF to build the final signal */
s->x[s->ptr] = (int16_t) (rlow + rhigh);
s->y[s->ptr] = (int16_t) (rlow - rhigh);
s->x[s->ptr] = saturate16 (rlow + rhigh);
s->y[s->ptr] = saturate16 (rlow - rhigh);
if (++s->ptr >= 12)
s->ptr = 0;
/* We shift by 12 to allow for the QMF filters (DC gain = 4096), less 1
Expand Down