diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-02-19 02:24:27 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-02-19 02:24:27 +0000 |
| commit | f5ca7cbda0e310413076dd3323a66da803e2b32c (patch) | |
| tree | eed67de9f2021dfb2e7aa31464bd7870ce7459b7 /pjmedia/src/pjmedia-codec | |
| parent | 49a3b60593925562cbeb836a5885e034d2f78997 (diff) | |
Fixing Makefiles for the new pjmedia-codec and pjsip-simple libraries
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@198 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm.c | 6 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/gsm/config.h | 18 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-codec/pjmedia-codec-lib.c (renamed from pjmedia/src/pjmedia-codec/pjmedia-codec.c) | 0 |
3 files changed, 13 insertions, 11 deletions
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c index cc41612a..3ef6dac4 100644 --- a/pjmedia/src/pjmedia-codec/gsm.c +++ b/pjmedia/src/pjmedia-codec/gsm.c @@ -280,6 +280,8 @@ static pj_status_t gsm_alloc_codec( pjmedia_codec_factory *factory, codec = pj_pool_zalloc(gsm_codec_factory.pool, sizeof(pjmedia_codec)); PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM); + codec->op = &gsm_op; + codec->factory = factory; } pj_mutex_unlock(gsm_codec_factory.mutex); @@ -413,7 +415,7 @@ static pj_status_t gsm_codec_encode( pjmedia_codec *codec, if (input->size < 320) return PJMEDIA_CODEC_EPCMTOOSHORT; - gsm_encode(codec->codec_data, (const short*)input->buf, + gsm_encode(codec->codec_data, (short*)input->buf, (unsigned char*)output->buf); output->size = 33; @@ -440,7 +442,7 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec, return PJMEDIA_CODEC_EFRMTOOSHORT; gsm_decode(codec->codec_data, - (const unsigned char*)input->buf, + (unsigned char*)input->buf, (short*)output->buf); output->size = 320; diff --git a/pjmedia/src/pjmedia-codec/gsm/config.h b/pjmedia/src/pjmedia-codec/gsm/config.h index cea29465..c31d5141 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-codec/pjmedia-codec.c b/pjmedia/src/pjmedia-codec/pjmedia-codec-lib.c index 25a3028d..25a3028d 100644 --- a/pjmedia/src/pjmedia-codec/pjmedia-codec.c +++ b/pjmedia/src/pjmedia-codec/pjmedia-codec-lib.c |