diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-01-12 11:23:02 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-01-12 11:23:02 +0000 |
| commit | 4d9f684e7174cbd3ded5ab9b3f9606f8e674dbef (patch) | |
| tree | 1406e2c41c53ef3cd9a581035ed4f3b2c8062561 /pjsip-apps | |
| parent | 3924e531fa1bde05b655f8b61e94de0f75a21ecd (diff) | |
Ticket #446: Added sample application to mix WAV files using conference bridge
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1681 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/build/Samples-vc.mak | 1 | ||||
| -rw-r--r-- | pjsip-apps/build/Samples.mak | 1 | ||||
| -rw-r--r-- | pjsip-apps/build/samples.dsp | 4 | ||||
| -rw-r--r-- | pjsip-apps/build/samples.vcproj | 4 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/encdec.c | 2 |
5 files changed, 11 insertions, 1 deletions
diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak index 59a9b085..de000dc1 100644 --- a/pjsip-apps/build/Samples-vc.mak +++ b/pjsip-apps/build/Samples-vc.mak @@ -52,6 +52,7 @@ SAMPLES = $(BINDIR)\confsample.exe \ $(BINDIR)\confbench.exe \ $(BINDIR)\encdec.exe \ $(BINDIR)\level.exe \ + $(BINDIR)\mix.exe \ $(BINDIR)\pjsip-perf.exe \ $(BINDIR)\playfile.exe \ $(BINDIR)\playsine.exe\ diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index 2535d019..3a81f3c9 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -16,6 +16,7 @@ BINDIR := ../bin/samples SAMPLES := confsample \ encdec \ level \ + mix \ pjsip-perf \ playfile \ playsine \ diff --git a/pjsip-apps/build/samples.dsp b/pjsip-apps/build/samples.dsp index a4831820..3bdca954 100644 --- a/pjsip-apps/build/samples.dsp +++ b/pjsip-apps/build/samples.dsp @@ -114,6 +114,10 @@ SOURCE=..\src\samples\level.c # End Source File
# Begin Source File
+SOURCE=..\src\samples\mix.c
+# End Source File
+# Begin Source File
+
SOURCE="..\src\samples\pjsip-perf.c"
# End Source File
# Begin Source File
diff --git a/pjsip-apps/build/samples.vcproj b/pjsip-apps/build/samples.vcproj index e7326341..ea22d224 100644 --- a/pjsip-apps/build/samples.vcproj +++ b/pjsip-apps/build/samples.vcproj @@ -94,6 +94,10 @@ >
</File>
<File
+ RelativePath="..\src\samples\mix.c"
+ >
+ </File>
+ <File
RelativePath="..\src\samples\pjsip-perf.c"
>
</File>
diff --git a/pjsip-apps/src/samples/encdec.c b/pjsip-apps/src/samples/encdec.c index ede706e4..22ede776 100644 --- a/pjsip-apps/src/samples/encdec.c +++ b/pjsip-apps/src/samples/encdec.c @@ -201,7 +201,7 @@ static pj_status_t enc_dec_test(const char *codec_id, out_frm.buf = (char*)pcmbuf; out_frm.size = sizeof(pcmbuf); - if ((pj_rand() % 100) < lost_pct) { + if ((pj_rand() % 100) < (int)lost_pct) { /* Simulate loss */ CHECK( codec->op->recover(codec, sizeof(pcmbuf), &out_frm) ); TRACE_((THIS_FILE, "%d.%03d Packet lost", T)); |