Better support for continuing media when peer has restarted transmission/RTP session
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@408 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak
index 40ee2e9..1aa5d9a 100644
--- a/pjsip-apps/build/Samples-vc.mak
+++ b/pjsip-apps/build/Samples-vc.mak
@@ -40,7 +40,8 @@
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 d048ec5..95320b8 100644
--- a/pjsip-apps/build/Samples.mak
+++ b/pjsip-apps/build/Samples.mak
@@ -39,7 +39,7 @@
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 b6c1005..ed6f2e9 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 ca7f07d..ed14154 100644
--- a/pjsip-apps/src/samples/siprtp.c
+++ b/pjsip-apps/src/samples/siprtp.c
@@ -1246,7 +1246,7 @@
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
similarity index 99%
rename from pjsip-apps/src/samples/stream.c
rename to pjsip-apps/src/samples/streamutil.c
index 8503c1b..8c412c8 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 @@
"\n"
"\n"
" USAGE: \n"
- " stream [options] \n"
+ " streamutil [options] \n"
"\n"
"\n"
" Options:\n"