Skip to content

Commit af7eee5

Browse files
author
Jason Parker
committed
Merge branch 'patch/configurable-resample' of github.com:asterisk/pjproject
2 parents af93a26 + 3ebc56a commit af7eee5

14 files changed

+141
-15
lines changed

‎aconfigure

+27-11
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,7 @@ ac_pa_use_alsa
641641
ac_pa_cflags
642642
ac_external_pa
643643
ac_pjmedia_snd
644+
ac_pjmedia_resample
644645
ac_external_srtp
645646
ac_external_gsm
646647
ac_external_speex
@@ -735,6 +736,7 @@ enable_shared
735736
with_external_speex
736737
with_external_gsm
737738
with_external_srtp
739+
enable_resample
738740
enable_sound
739741
with_external_pa
740742
enable_oss
@@ -1402,6 +1404,7 @@ Optional Features:
14021404
Disable floating point where possible
14031405
--enable-epoll Use /dev/epoll ioqueue on Linux (experimental)
14041406
--enable-shared Build shared libraries
1407+
--disable-resample Disable resampling implementations
14051408
--disable-sound Exclude sound (i.e. use null sound)
14061409
--disable-oss Disable OSS audio (default: not disabled)
14071410
--disable-video Disable video feature
@@ -1416,8 +1419,7 @@ Optional Features:
14161419
--disable-g7221-codec Exclude G.7221 codec in the build
14171420
--disable-speex-codec Exclude Speex codecs in the build
14181421
--disable-ilbc-codec Exclude iLBC codec in the build
1419-
--enable-libsamplerate Link with libsamplerate when available. Note that
1420-
PJMEDIA_RESAMPLE_IMP must also be configured
1422+
--enable-libsamplerate Link with libsamplerate when available.
14211423
--enable-resample-dll Build libresample as shared library
14221424
--disable-sdl Disable SDL (default: not disabled)
14231425
--disable-ffmpeg Disable ffmpeg (default: not disabled)
@@ -5865,6 +5867,19 @@ fi
58655867

58665868

58675869

5870+
ac_pjmedia_resample=libresample
5871+
5872+
# Check whether --enable-resample was given.
5873+
if test "${enable_resample+set}" = set; then :
5874+
enableval=$enable_resample; if test "$enable_resample" = "no"; then
5875+
ac_pjmedia_resample=none
5876+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5
5877+
$as_echo "Checking if resampling is disabled...yes" >&6; }
5878+
fi
5879+
5880+
fi
5881+
5882+
58685883

58695884
# Check whether --enable-sound was given.
58705885
if test "${enable_sound+set}" = set; then :
@@ -6322,6 +6337,7 @@ _ACEOF
63226337

63236338
fi
63246339

6340+
ac_pjmedia_resample=libsamplerate
63256341
else
63266342
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Skipping libsamplerate detection" >&5
63276343
$as_echo "Skipping libsamplerate detection" >&6; }
@@ -7519,20 +7535,20 @@ $as_echo "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; }
75197535

75207536

75217537
ac_fn_c_check_header_mongrel "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default"
7522-
if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes; then :
7538+
if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = x""yes; then :
75237539
opencore_amrwb_enc_h_present=1
75247540
fi
75257541

75267542

75277543
ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default"
7528-
if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes; then :
7544+
if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = x""yes; then :
75297545
opencore_amrwb_dec_h_present=1
75307546
fi
75317547

75327548

75337549
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5
75347550
$as_echo_n "checking for D_IF_init in -lopencore-amrwb... " >&6; }
7535-
if ${ac_cv_lib_opencore_amrwb_D_IF_init+:} false; then :
7551+
if test "${ac_cv_lib_opencore_amrwb_D_IF_init+set}" = set; then :
75367552
$as_echo_n "(cached) " >&6
75377553
else
75387554
ac_check_lib_save_LIBS=$LIBS
@@ -7566,13 +7582,13 @@ LIBS=$ac_check_lib_save_LIBS
75667582
fi
75677583
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
75687584
$as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
7569-
if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then :
7585+
if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = x""yes; then :
75707586
opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"
75717587
fi
75727588

75737589
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
75747590
$as_echo_n "checking for E_IF_init in -lvo-amrwbenc... " >&6; }
7575-
if ${ac_cv_lib_vo_amrwbenc_E_IF_init+:} false; then :
7591+
if test "${ac_cv_lib_vo_amrwbenc_E_IF_init+set}" = set; then :
75767592
$as_echo_n "(cached) " >&6
75777593
else
75787594
ac_check_lib_save_LIBS=$LIBS
@@ -7606,7 +7622,7 @@ LIBS=$ac_check_lib_save_LIBS
76067622
fi
76077623
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vo_amrwbenc_E_IF_init" >&5
76087624
$as_echo "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; }
7609-
if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes; then :
7625+
if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = x""yes; then :
76107626
opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"
76117627
fi
76127628

@@ -7665,14 +7681,14 @@ $as_echo "Using SILK prefix... $with_silk" >&6; }
76657681

76667682

76677683
ac_fn_c_check_header_mongrel "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default"
7668-
if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes; then :
7684+
if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = x""yes; then :
76697685
silk_h_present=1
76707686
fi
76717687

76727688

76737689
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5
76747690
$as_echo_n "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; }
7675-
if ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+:} false; then :
7691+
if test "${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+set}" = set; then :
76767692
$as_echo_n "(cached) " >&6
76777693
else
76787694
ac_check_lib_save_LIBS=$LIBS
@@ -7706,7 +7722,7 @@ LIBS=$ac_check_lib_save_LIBS
77067722
fi
77077723
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&5
77087724
$as_echo "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; }
7709-
if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes; then :
7725+
if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = x""yes; then :
77107726
silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK"
77117727
fi
77127728

‎aconfigure.ac

+14-2
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,17 @@ AC_ARG_WITH(external-srtp,
546546
)
547547

548548

549+
dnl # Resample implementation
550+
AC_SUBST(ac_pjmedia_resample,libresample)
551+
AC_ARG_ENABLE(resample,
552+
AC_HELP_STRING([--disable-resample],
553+
[Disable resampling implementations]),
554+
[if test "$enable_resample" = "no"; then
555+
[ac_pjmedia_resample=none]
556+
AC_MSG_RESULT([Checking if resampling is disabled...yes])
557+
fi]
558+
)
559+
549560
dnl # Sound device backend selection
550561
AC_SUBST(ac_pjmedia_snd)
551562
AC_ARG_ENABLE(sound,
@@ -838,8 +849,9 @@ AC_ARG_ENABLE(ilbc-codec,
838849
dnl # Include libsamplerate
839850
AC_ARG_ENABLE(libsamplerate,
840851
AC_HELP_STRING([--enable-libsamplerate],
841-
[Link with libsamplerate when available. Note that PJMEDIA_RESAMPLE_IMP must also be configured]),
842-
[ AC_CHECK_LIB(samplerate,src_new) ],
852+
[Link with libsamplerate when available.]),
853+
[ AC_CHECK_LIB(samplerate,src_new) ]
854+
[ac_pjmedia_resample=libsamplerate],
843855
AC_MSG_RESULT([Skipping libsamplerate detection])
844856
)
845857

‎build.mak.in

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$
4444
endif
4545
endif
4646

47+
ifeq (@ac_pjmedia_resample@,libresample)
4748
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
4849
ifeq ($(PJ_SHARED_LIBRARIES),)
4950
ifeq (@ac_resample_dll@,1)
@@ -57,6 +58,7 @@ else
5758
APP_THIRD_PARTY_LIBS += -lresample
5859
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
5960
endif
61+
endif
6062

6163
ifneq (@ac_no_gsm_codec@,1)
6264
ifeq (@ac_external_gsm@,1)

‎pjmedia/build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
6666
event.o format.o ffmpeg_util.o \
6767
g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
6868
null_port.o plc_common.o port.o splitcomb.o \
69-
resample_resample.o resample_libsamplerate.o \
69+
resample_resample.o resample_libsamplerate.o resample_speex.o \
7070
resample_port.o rtcp.o rtcp_xr.o rtp.o \
7171
sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
7272
sound_legacy.o sound_port.o stereo_port.o stream_common.o \

‎pjmedia/build/os-auto.mak.in

+22
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,28 @@ export CFLAGS += -I$(THIRD_PARTY)/build/srtp \
140140

141141
endif
142142

143+
#
144+
# Resample
145+
#
146+
AC_PJMEDIA_RESAMPLE=@ac_pjmedia_resample@
147+
148+
ifeq ($(AC_PJMEDIA_RESAMPLE),none)
149+
# No resample support
150+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
151+
endif
152+
153+
ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
154+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
155+
endif
156+
157+
ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
158+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
159+
endif
160+
161+
ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
162+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
163+
endif
164+
143165
#
144166
# PortAudio
145167
#

‎pjmedia/build/os-darwinos.mak

+21
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,27 @@ export CODEC_OBJS += g7221.o
7878
export G7221_CFLAGS += -I$(THIRD_PARTY)
7979
endif
8080

81+
#
82+
# Resample
83+
#
84+
AC_PJMEDIA_RESAMPLE=libresample
85+
86+
ifeq ($(AC_PJMEDIA_RESAMPLE),none)
87+
# No resample support
88+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
89+
endif
90+
91+
ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
92+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
93+
endif
94+
95+
ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
96+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
97+
endif
98+
99+
ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
100+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
101+
endif
81102

82103
#
83104
# SRTP

‎pjmedia/build/os-linux.mak

+21
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,27 @@ export CODEC_OBJS += g7221.o
7272
export G7221_CFLAGS += -I$(THIRD_PARTY)
7373
endif
7474

75+
#
76+
# Resample
77+
#
78+
AC_PJMEDIA_RESAMPLE=libresample
79+
80+
ifeq ($(AC_PJMEDIA_RESAMPLE),none)
81+
# No resample support
82+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
83+
endif
84+
85+
ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
86+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
87+
endif
88+
89+
ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
90+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
91+
endif
92+
93+
ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
94+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
95+
endif
7596

7697
#
7798
# SRTP

‎pjmedia/build/os-rtems.mak

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND
66
export PJMEDIA_OBJS += nullsound.o
77
export SOUND_OBJS = $(NULLSOUND_OBJS)
88

9+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE

‎pjmedia/build/os-win32.mak

+21
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,27 @@ export CODEC_OBJS += g7221.o
7474
export G7221_CFLAGS += -I$(THIRD_PARTY)
7575
endif
7676

77+
#
78+
# Resample
79+
#
80+
AC_PJMEDIA_RESAMPLE=libresample
81+
82+
ifeq ($(AC_PJMEDIA_RESAMPLE),none)
83+
# No resample support
84+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_NONE
85+
endif
86+
87+
ifeq ($(AC_PJMEDIA_RESAMPLE),libresample)
88+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBRESAMPLE
89+
endif
90+
91+
ifeq ($(AC_PJMEDIA_RESAMPLE),libsamplerate)
92+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_LIBSAMPLERATE
93+
endif
94+
95+
ifeq ($(AC_PJMEDIA_RESAMPLE),speex)
96+
export CFLAGS += -DPJMEDIA_RESAMPLE_IMP=PJMEDIA_RESAMPLE_SPEEX
97+
endif
7798

7899
#
79100
# SRTP

‎third_party/build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DIRS = resample milenage
1+
DIRS = milenage
22

33
include ../../build.mak
44
include $(PJDIR)/build/common.mak

‎third_party/build/os-auto.mak.in

+4
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ ifeq (@ac_external_srtp@,1)
3636
else
3737
DIRS += srtp
3838
endif
39+
40+
ifeq (@ac_pjmedia_resample@,libresample)
41+
DIRS += resample
42+
endif

‎third_party/build/os-darwinos.mak

+2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ DIRS += ilbc
33
DIRS += speex
44
DIRS += portaudio
55
DIRS += g7221
6+
DIRS += srtp
7+
DIRS += resample
68

79

‎third_party/build/os-linux.mak

+2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ DIRS += ilbc
33
DIRS += speex
44
DIRS += portaudio
55
DIRS += g7221
6+
DIRS += srtp
7+
DIRS += resample
68

79

‎third_party/build/os-win32.mak

+2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ DIRS += ilbc
33
DIRS += speex
44
DIRS += portaudio
55
DIRS += g7221
6+
DIRS += srtp
7+
DIRS += resample
68

79

0 commit comments

Comments
 (0)