diff options
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/build/Makefile | 11 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/gsm/config.h | 20 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/file_port.c | 1 |
3 files changed, 16 insertions, 16 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index 73a290af..482f66d8 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -29,9 +29,10 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ PA_DIR:=portaudio export PJMEDIA_SRCDIR = ../src/pjmedia export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ - codec.o endpoint.o errno.o g711.o jbuf.o rtcp.o \ - rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o stream.o \ - pasound.o \ + codec.o conference.o endpoint.o errno.o file_port.o \ + g711.o jbuf.o pasound.o port.o rtcp.o \ + rtp.o sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \ + stream.o \ $(PA_DIR)/pa_allocation.o \ $(PA_DIR)/pa_converters.o \ $(PA_DIR)/pa_cpuload.o \ @@ -51,10 +52,10 @@ export PJMEDIA_CFLAGS += $(_CFLAGS) export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec export PJMEDIA_CODEC_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ gsm.o pjmedia-codec-lib.o \ - gsm/add.o gsm/code.o gsm/debug.o gsm/decode.o \ + gsm/add.o gsm/code.o gsm/decode.o \ gsm/gsm_create.o gsm/gsm_decode.o gsm/gsm_destroy.o \ gsm/gsm_encode.o gsm/gsm_explode.o gsm/gsm_implode.o \ - gsm/gsm_option.o gsm/gsm_print.o gsm/long_term.o \ + gsm/gsm_option.o gsm/long_term.o \ gsm/lpc.o gsm/preprocess.o gsm/rpe.o gsm/short_term.o \ gsm/table.o export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) diff --git a/pjmedia/src/pjmedia-codec/gsm/config.h b/pjmedia/src/pjmedia-codec/gsm/config.h index c31d5141..4dd0f274 100644 --- a/pjmedia/src/pjmedia-codec/gsm/config.h +++ b/pjmedia/src/pjmedia-codec/gsm/config.h @@ -9,30 +9,30 @@ #ifndef CONFIG_H #define CONFIG_H -/*efine SIGHANDLER_T int //* signal handlers are void */ -/*efine HAS_SYSV_SIGNAL 1 //* sigs not blocked/reset? */ +/*efine SIGHANDLER_T int // * signal handlers are void */ +/*efine HAS_SYSV_SIGNAL 1 // * sigs not blocked/reset? */ #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -/*efine HAS_LIMITS_H 1 //* /usr/include/limits.h */ +/*efine HAS_LIMITS_H 1 // * /usr/include/limits.h */ #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ -/*efine HAS_ERRNO_DECL 1 //* errno.h declares errno */ +/*efine HAS_ERRNO_DECL 1 // * errno.h declares errno */ #define HAS_FSTAT 1 /* fstat syscall */ #define HAS_FCHMOD 1 /* fchmod syscall */ #define HAS_CHMOD 1 /* chmod syscall */ #define HAS_FCHOWN 1 /* fchown syscall */ #define HAS_CHOWN 1 /* chown syscall */ -/*efine HAS__FSETMODE 1 //* _fsetmode -- set file mode */ +/*efine HAS__FSETMODE 1 // * _fsetmode -- set file mode */ #define HAS_STRING_H 1 /* /usr/include/string.h */ -/*efine HAS_STRINGS_H 1 //* /usr/include/strings.h */ +/*efine HAS_STRINGS_H 1 // * /usr/include/strings.h */ #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ #define HAS_UTIME 1 /* POSIX utime(path, times) */ -/*efine HAS_UTIMES 1 //* use utimes() syscall instead */ +/*efine HAS_UTIMES 1 // * use utimes() syscall instead */ #define HAS_UTIME_H 1 /* UTIME header file */ -/*efine HAS_UTIMBUF 1 //* struct utimbuf */ -/*efine HAS_UTIMEUSEC 1 //* microseconds in utimbuf? */ -
+/*efine HAS_UTIMBUF 1 // * struct utimbuf */ +/*efine HAS_UTIMEUSEC 1 // * microseconds in utimbuf? */ + #endif /* CONFIG_H */ diff --git a/pjmedia/src/pjmedia/file_port.c b/pjmedia/src/pjmedia/file_port.c index 1d7e9872..cb8059d3 100644 --- a/pjmedia/src/pjmedia/file_port.c +++ b/pjmedia/src/pjmedia/file_port.c @@ -43,7 +43,6 @@ static pj_status_t file_put_frame(pjmedia_port *this_port, static pj_status_t file_get_frame(pjmedia_port *this_port, pjmedia_frame *frame); static pj_status_t file_on_destroy(pjmedia_port *this_port); -static pj_status_t read_buffer(struct file_port *port); static struct file_port *create_file_port(pj_pool_t *pool) { |