More ticket #507: updated GNU build system with the G.722 codec and fixed minor warning about operator precedence

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1871 74dad513-b988-da41-8d7b-12977e46ad98

6 files changed, 36 insertions, 2 deletions

diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 7e18ea92..ce823913 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -26,6 +26,7 @@ AC_NO_L16_CODEC=@ac_no_l16_codec@
 AC_NO_GSM_CODEC=@ac_no_gsm_codec@
 AC_NO_SPEEX_CODEC=@ac_no_speex_codec@
 AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@
+AC_NO_G722_CODEC=@ac_no_g722_codec@
 
 export CODEC_OBJS=
 
@@ -65,6 +66,12 @@ else
 export CODEC_OBJS += ilbc.o
 endif
 
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
 
 #
 # PortAudio
diff --git a/pjmedia/build/os-darwinos.mak b/pjmedia/build/os-darwinos.mak
index f76d3403..1126bc3f 100644
--- a/pjmedia/build/os-darwinos.mak
+++ b/pjmedia/build/os-darwinos.mak
@@ -23,6 +23,7 @@ AC_NO_L16_CODEC=0
 AC_NO_GSM_CODEC=0
 AC_NO_SPEEX_CODEC=0
 AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
 
 export CODEC_OBJS=
 
@@ -63,6 +64,12 @@ else
 export CODEC_OBJS += ilbc.o
 endif
 
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
 
 #
 # PortAudio
diff --git a/pjmedia/build/os-linux.mak b/pjmedia/build/os-linux.mak
index f707eb5c..184284e9 100644
--- a/pjmedia/build/os-linux.mak
+++ b/pjmedia/build/os-linux.mak
@@ -18,6 +18,7 @@ AC_NO_L16_CODEC=0
 AC_NO_GSM_CODEC=0
 AC_NO_SPEEX_CODEC=0
 AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
 
 export CODEC_OBJS=
 
@@ -57,6 +58,12 @@ else
 export CODEC_OBJS += ilbc.o
 endif
 
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
 
 #
 # PortAudio
diff --git a/pjmedia/build/os-win32.mak b/pjmedia/build/os-win32.mak
index 0767ceec..dcc4dea9 100644
--- a/pjmedia/build/os-win32.mak
+++ b/pjmedia/build/os-win32.mak
@@ -19,6 +19,7 @@ AC_NO_L16_CODEC=0
 AC_NO_GSM_CODEC=0
 AC_NO_SPEEX_CODEC=0
 AC_NO_ILBC_CODEC=0
+AC_NO_G722_CODEC=0
 
 export CODEC_OBJS=
 
@@ -59,6 +60,12 @@ else
 export CODEC_OBJS += ilbc.o
 endif
 
+ifeq ($(AC_NO_G722_CODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
+else
+export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
+endif
+
 
 #
 # PortAudio
diff --git a/pjmedia/include/pjmedia-codec/config_auto.h.in b/pjmedia/include/pjmedia-codec/config_auto.h.in
index 528390cd..efbfdd1a 100644
--- a/pjmedia/include/pjmedia-codec/config_auto.h.in
+++ b/pjmedia/include/pjmedia-codec/config_auto.h.in
@@ -54,6 +54,12 @@
 #endif
 
 
+/* G722 codec */
+#ifndef PJMEDIA_HAS_G722_CODEC
+#undef PJMEDIA_HAS_G722_CODEC
+#endif
+
+
 #endif	/* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */
 
 
diff --git a/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/pjmedia/src/pjmedia-codec/g722/g722_enc.c
index e71aad1b..30453eb9 100644
--- a/pjmedia/src/pjmedia-codec/g722/g722_enc.c
+++ b/pjmedia/src/pjmedia-codec/g722/g722_enc.c
@@ -76,7 +76,7 @@ static int block1l (int xl, int sl, int detl)
 
     sil = el >> 15 ;
     if (sil == 0 )  wd = el ;
-    else wd = 32767 - el & 32767 ;
+    else wd = 32767 - (el & 32767) ;
 
     mil = 1 ;
 
@@ -304,7 +304,7 @@ static int block1h (int xh, int sh, int deth)
 
     sih = eh >> 15 ;
     if (sih == 0 )  wd = eh ;
-    else wd = 32767 - eh & 32767 ;
+    else wd = 32767 - (eh & 32767) ;
 
     hdu = (564 << 3) * deth;
     wd1 = (hdu >> 15) ;