Changeset 1871


Ignore:
Timestamp:
Mar 17, 2008 2:24:21 PM (12 years ago)
Author:
bennylp
Message:

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

Location:
pjproject/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r1863 r1871  
    309309#endif" 
    310310 
    311 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX ac_pjdir CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_pa_use_oss ac_no_small_filter ac_no_large_filter ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS' 
     311ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX ac_pjdir CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_pa_use_oss ac_no_small_filter ac_no_large_filter ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_g722_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS' 
    312312ac_subst_files='' 
    313313 
     
    866866  --disable-l16-codec     Exclude Linear/L16 codec family from the build 
    867867  --disable-gsm-codec     Exclude GSM codec in the build 
     868  --disable-g722-codec    Exclude G.722 codec in the build 
    868869  --disable-speex-codec   Exclude Speex codecs in the build 
    869870  --disable-ilbc-codec    Exclude iLBC codec in the build 
     
    1047210473  echo "$as_me:$LINENO: result: Checking if GSM codec is disabled...no" >&5 
    1047310474echo "${ECHO_T}Checking if GSM codec is disabled...no" >&6 
     10475fi; 
     10476 
     10477 
     10478# Check whether --enable-g722-codec or --disable-g722-codec was given. 
     10479if test "${enable_g722_codec+set}" = set; then 
     10480  enableval="$enable_g722_codec" 
     10481  if test "$enable_g722_codec" = "no"; then 
     10482                ac_no_g722_codec=1 
     10483                cat >>confdefs.h <<\_ACEOF 
     10484#define PJMEDIA_HAS_G722_CODEC 0 
     10485_ACEOF 
     10486 
     10487                echo "$as_me:$LINENO: result: Checking if G.722 codec is disabled...yes" >&5 
     10488echo "${ECHO_T}Checking if G.722 codec is disabled...yes" >&6 
     10489               fi 
     10490else 
     10491  echo "$as_me:$LINENO: result: Checking if G.722 codec is disabled...no" >&5 
     10492echo "${ECHO_T}Checking if G.722 codec is disabled...no" >&6 
    1047410493fi; 
    1047510494 
     
    1167811697s,@ac_no_l16_codec@,$ac_no_l16_codec,;t t 
    1167911698s,@ac_no_gsm_codec@,$ac_no_gsm_codec,;t t 
     11699s,@ac_no_g722_codec@,$ac_no_g722_codec,;t t 
    1168011700s,@ac_no_speex_codec@,$ac_no_speex_codec,;t t 
    1168111701s,@ac_no_ilbc_codec@,$ac_no_ilbc_codec,;t t 
  • pjproject/trunk/aconfigure.ac

    r1863 r1871  
    476476              AC_MSG_RESULT([Checking if GSM codec is disabled...no])) 
    477477 
     478dnl # Include G.722 codec 
     479AC_SUBST(ac_no_g722_codec) 
     480AC_ARG_ENABLE(g722-codec, 
     481              AC_HELP_STRING([--disable-g722-codec], 
     482                             [Exclude G.722 codec in the build]), 
     483              [if test "$enable_g722_codec" = "no"; then 
     484                [ac_no_g722_codec=1] 
     485                AC_DEFINE(PJMEDIA_HAS_G722_CODEC,0) 
     486                AC_MSG_RESULT([Checking if G.722 codec is disabled...yes]) 
     487               fi], 
     488              AC_MSG_RESULT([Checking if G.722 codec is disabled...no])) 
     489 
    478490dnl # Include Speex codec 
    479491AC_SUBST(ac_no_speex_codec) 
  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r1202 r1871  
    2727AC_NO_SPEEX_CODEC=@ac_no_speex_codec@ 
    2828AC_NO_ILBC_CODEC=@ac_no_ilbc_codec@ 
     29AC_NO_G722_CODEC=@ac_no_g722_codec@ 
    2930 
    3031export CODEC_OBJS= 
     
    6667endif 
    6768 
     69ifeq ($(AC_NO_G722_CODEC),1) 
     70export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 
     71else 
     72export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o 
     73endif 
     74 
    6875 
    6976# 
  • pjproject/trunk/pjmedia/build/os-darwinos.mak

    r1202 r1871  
    2424AC_NO_SPEEX_CODEC=0 
    2525AC_NO_ILBC_CODEC=0 
     26AC_NO_G722_CODEC=0 
    2627 
    2728export CODEC_OBJS= 
     
    6465endif 
    6566 
     67ifeq ($(AC_NO_G722_CODEC),1) 
     68export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 
     69else 
     70export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o 
     71endif 
     72 
    6673 
    6774# 
  • pjproject/trunk/pjmedia/build/os-linux.mak

    r1202 r1871  
    1919AC_NO_SPEEX_CODEC=0 
    2020AC_NO_ILBC_CODEC=0 
     21AC_NO_G722_CODEC=0 
    2122 
    2223export CODEC_OBJS= 
     
    5859endif 
    5960 
     61ifeq ($(AC_NO_G722_CODEC),1) 
     62export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 
     63else 
     64export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o 
     65endif 
     66 
    6067 
    6168# 
  • pjproject/trunk/pjmedia/build/os-win32.mak

    r1202 r1871  
    2020AC_NO_SPEEX_CODEC=0 
    2121AC_NO_ILBC_CODEC=0 
     22AC_NO_G722_CODEC=0 
    2223 
    2324export CODEC_OBJS= 
     
    6061endif 
    6162 
     63ifeq ($(AC_NO_G722_CODEC),1) 
     64export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 
     65else 
     66export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o 
     67endif 
     68 
    6269 
    6370# 
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config_auto.h.in

    r909 r1871  
    5555 
    5656 
     57/* G722 codec */ 
     58#ifndef PJMEDIA_HAS_G722_CODEC 
     59#undef PJMEDIA_HAS_G722_CODEC 
     60#endif 
     61 
     62 
    5763#endif  /* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */ 
    5864 
  • pjproject/trunk/pjmedia/src/pjmedia-codec/g722/g722_enc.c

    r1870 r1871  
    7777    sil = el >> 15 ; 
    7878    if (sil == 0 )  wd = el ; 
    79     else wd = 32767 - el & 32767 ; 
     79    else wd = 32767 - (el & 32767) ; 
    8080 
    8181    mil = 1 ; 
     
    305305    sih = eh >> 15 ; 
    306306    if (sih == 0 )  wd = eh ; 
    307     else wd = 32767 - eh & 32767 ; 
     307    else wd = 32767 - (eh & 32767) ; 
    308308 
    309309    hdu = (564 << 3) * deth; 
Note: See TracChangeset for help on using the changeset viewer.