diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-04-24 23:13:00 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-04-24 23:13:00 +0000 |
| commit | 30b72e6036e0dd2bbe85e5929dc4201357d258db (patch) | |
| tree | 3c15f9ff17b095a7a33d9be98d102a90190dbbba /pjsip-apps | |
| parent | 0659acc8c5810d565d6b0c39e8dbfa7862784ada (diff) | |
Better support for continuing media when peer has restarted transmission/RTP session
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@408 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/build/Samples-vc.mak | 3 | ||||
| -rw-r--r-- | pjsip-apps/build/Samples.mak | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/debug.c | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/streamutil.c (renamed from pjsip-apps/src/samples/stream.c) | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index 40ee2e9b..1aa5d9ac 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -40,7 +40,8 @@ BINDIR = ..\bin\samples SAMPLES = $(BINDIR)\simpleua.exe $(BINDIR)\playfile.exe $(BINDIR)\playsine.exe\ $(BINDIR)\confsample.exe $(BINDIR)\sndinfo.exe \ $(BINDIR)\level.exe $(BINDIR)\recfile.exe \ - $(BINDIR)\resampleplay.exe $(BINDIR)\siprtp.exe $(BINDIR)\stream.exe + $(BINDIR)\resampleplay.exe $(BINDIR)\siprtp.exe \ + $(BINDIR)\streamutil.exe all: $(OBJDIR) $(SAMPLES) diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index d048ec51..95320b8f 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -39,7 +39,7 @@ OBJDIR := ./output/samples-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME) BINDIR := ../bin/samples SAMPLES := simpleua playfile playsine confsample sndinfo level recfile resampleplay \ - siprtp stream + siprtp streamutil EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)) diff --git a/pjsip-apps/src/samples/debug.c b/pjsip-apps/src/samples/debug.c index b6c10055..ed6f2e9f 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 "stream.c" +#include "streamutil.c" diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index ca7f07d5..ed14154f 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1246,7 +1246,7 @@ static void call_on_media_update( pjsip_inv_session *inv, pjmedia_rtp_session_init(&audio->out_sess, audio->si.tx_pt, pj_rand()); pjmedia_rtp_session_init(&audio->in_sess, audio->si.fmt.pt, 0); - pjmedia_rtcp_init(&audio->rtcp, audio->clock_rate, + pjmedia_rtcp_init(&audio->rtcp, "rtcp", audio->clock_rate, audio->samples_per_frame, 0); diff --git a/pjsip-apps/src/samples/stream.c b/pjsip-apps/src/samples/streamutil.c index 8503c1b8..8c412c83 100644 --- a/pjsip-apps/src/samples/stream.c +++ b/pjsip-apps/src/samples/streamutil.c @@ -19,7 +19,7 @@ static const char *desc = - " stream.c \n" + " streamutil \n" " \n" " PURPOSE: \n" " Demonstrate how to use pjmedia stream component to transmit/receive \n" @@ -27,7 +27,7 @@ static const char *desc = "\n" "\n" " USAGE: \n" - " stream [options] \n" + " streamutil [options] \n" "\n" "\n" " Options:\n" |