diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-08-02 19:41:37 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-08-02 19:41:37 +0000 |
| commit | 2a4656699b9fc1bc03ffb5723aa3da0cc1ba88c3 (patch) | |
| tree | fe0650e2366e7853437bcae768049ddf335d1338 /pjmedia | |
| parent | 2c5b8f5dca277dd3fee1ab1298bb0b2308372eae (diff) | |
Fix compilation error in MacOS because of recent changes in config.h, also disable AEC by default in pjsua-lib, and added ec-tail option in pjsua
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@643 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 5 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/speex/misc.h | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/aec_port.c | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index c0465f10..f176463f 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -50,7 +50,8 @@ NULLSOUND_OBJS := nullsound.o export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CFLAGS) $(CC_INC)../include $(CC_INC)../../pjlib/include \ $(CC_INC)../../pjlib-util/include \ - $(CC_INC)../src/pjmedia/portaudio + $(CC_INC)../src/pjmedia/portaudio \ + $(CC_INC)../src/pjmedia-codec export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ @@ -64,7 +65,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ # export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - alaw_ulaw.o \ + aec_port.o alaw_ulaw.o \ clock_thread.o codec.o conference.o endpoint.o errno.o \ g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ null_port.o plc_common.o plc_g711.o \ diff --git a/pjmedia/src/pjmedia-codec/speex/misc.h b/pjmedia/src/pjmedia-codec/speex/misc.h index 95e5d0cd..ea9cc387 100644 --- a/pjmedia/src/pjmedia-codec/speex/misc.h +++ b/pjmedia/src/pjmedia-codec/speex/misc.h @@ -62,7 +62,7 @@ #error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions? #endif #ifdef FIXED_POINT_DEBUG -#error Don't you think enabling fixed-point is a good thing to do if you want to debug that? +#error Dont you think enabling fixed-point is a good thing to do if you want to debug that? #endif diff --git a/pjmedia/src/pjmedia/aec_port.c b/pjmedia/src/pjmedia/aec_port.c index d00d9298..f772d859 100644 --- a/pjmedia/src/pjmedia/aec_port.c +++ b/pjmedia/src/pjmedia/aec_port.c @@ -93,9 +93,13 @@ PJ_DEF(pj_status_t) pjmedia_aec_port_create( pj_pool_t *pool, /* Done */ *p_port = &aec_port->base; - PJ_LOG(4,(THIS_FILE, "AEC created for port %.*s", + PJ_LOG(4,(THIS_FILE, "AEC created for port %.*s, clock_rate=%d, " + "samples per frame=%d, tail length=%d ms", (int)dn_port->info.name.slen, - dn_port->info.name.ptr)); + dn_port->info.name.ptr, + dn_port->info.clock_rate, + dn_port->info.samples_per_frame, + tail_length * 1000 / dn_port->info.clock_rate)); return PJ_SUCCESS; } |