From 4d7fd203b23f838e4cbd55cf1f87c31112ee0e5d Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sun, 14 May 2006 20:57:20 +0000 Subject: [PATCH] Fixed bug in siprtp because of recent changes in pjsip_session_info_from_sdp() git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@444 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/samples/debug.c | 2 +- pjsip-apps/src/samples/siprtp.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pjsip-apps/src/samples/debug.c b/pjsip-apps/src/samples/debug.c index a3974046d..259a7def1 100644 --- a/pjsip-apps/src/samples/debug.c +++ b/pjsip-apps/src/samples/debug.c @@ -27,5 +27,5 @@ * E.g.: * #include "playfile.c" */ -#include "sndinfo.c" +#include "siprtp.c" diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 4bc1f76b4..8b896b27c 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -48,12 +48,16 @@ static const char *USAGE = " --app-log-level=N Set app screen log verbosity (default=3)\n" " --log-file=FILE Write log to file FILE\n" "\n" +/* Don't support this anymore, because codec is properly examined in + pjmedia_session_info_from_sdp() function. + " Codec Options:\n" " --a-pt=PT Set audio payload type to PT (default=0)\n" " --a-name=NAME Set audio codec name to NAME (default=pcmu)\n" " --a-clock=RATE Set audio codec rate to RATE Hz (default=8000Hz)\n" " --a-bitrate=BPS Set audio codec bitrate to BPS (default=64000bps)\n" " --a-ptime=MS Set audio frame time to MS msec (default=20ms)\n" +*/ ; @@ -395,6 +399,9 @@ static pj_status_t init_media() PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + /* Add G711 codec */ + pjmedia_codec_g711_init(app.med_endpt); + /* Determine address to bind socket */ pj_memset(&addr, 0, sizeof(addr)); addr.sin_family = PJ_AF_INET; @@ -826,11 +833,14 @@ static pj_status_t init_options(int argc, char *argv[]) { "log-level", 1, 0, 'l' }, { "app-log-level", 1, 0, OPT_APP_LOG_LEVEL }, { "log-file", 1, 0, OPT_LOG_FILE }, + + /* Don't support this anymore, see comments in USAGE above. { "a-pt", 1, 0, OPT_A_PT }, { "a-name", 1, 0, OPT_A_NAME }, { "a-clock", 1, 0, OPT_A_CLOCK }, { "a-bitrate", 1, 0, OPT_A_BITRATE }, { "a-ptime", 1, 0, OPT_A_PTIME }, + */ { NULL, 0, 0, 0 }, };