diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-04-18 00:34:45 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-04-18 00:34:45 +0000 |
| commit | a9881591ed3197d05013342bd103102cc949120c (patch) | |
| tree | 3293d6df340f0e8c7c40411d85fff0102f38d5b6 /pjmedia | |
| parent | 65b9c4b08330956be59e6807f0db37d50cb2c339 (diff) | |
More ticket #774: updated VS6, VS8, and Makefile for the Siren7/Siren14 test vectors
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2614 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/build/Makefile | 2 | ||||
| -rw-r--r-- | pjmedia/build/pjmedia_test.dsp | 4 | ||||
| -rw-r--r-- | pjmedia/build/pjmedia_test.vcproj | 4 | ||||
| -rw-r--r-- | pjmedia/src/test/codec_vectors.c | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile index c0915b43..6e3a9a2e 100644 --- a/pjmedia/build/Makefile +++ b/pjmedia/build/Makefile @@ -103,7 +103,7 @@ export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ # Defines for building test application # export PJMEDIA_TEST_SRCDIR = ../src/test -export PJMEDIA_TEST_OBJS += jbuf_test.o main.o mips_test.o rtp_test.o test.o +export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o #export PJMEDIA_TEST_OBJS += sdp_neg_test.o export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) diff --git a/pjmedia/build/pjmedia_test.dsp b/pjmedia/build/pjmedia_test.dsp index 786483fb..b5514976 100644 --- a/pjmedia/build/pjmedia_test.dsp +++ b/pjmedia/build/pjmedia_test.dsp @@ -87,6 +87,10 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\src\test\codec_vectors.c
+# End Source File
+# Begin Source File
+
SOURCE=..\src\test\jbuf_test.c
# End Source File
# Begin Source File
diff --git a/pjmedia/build/pjmedia_test.vcproj b/pjmedia/build/pjmedia_test.vcproj index 4eac925c..24336651 100644 --- a/pjmedia/build/pjmedia_test.vcproj +++ b/pjmedia/build/pjmedia_test.vcproj @@ -1049,6 +1049,10 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
+ RelativePath="..\src\test\codec_vectors.c"
+ >
+ </File>
+ <File
RelativePath="..\src\test\jbuf_test.c"
>
<FileConfiguration
diff --git a/pjmedia/src/test/codec_vectors.c b/pjmedia/src/test/codec_vectors.c index 11d2f230..dc6333cd 100644 --- a/pjmedia/src/test/codec_vectors.c +++ b/pjmedia/src/test/codec_vectors.c @@ -412,6 +412,7 @@ int codec_test_vectors(void) "../src/test/vectors/g722_1_enc_out_32000_be.pak" }, #endif + { NULL } }; struct dec_vectors { char *codec_name; @@ -434,6 +435,7 @@ int codec_test_vectors(void) "../src/test/vectors/g722_1_dec_out_32000.pcm" }, #endif + { NULL } }; unsigned i; pj_status_t status; @@ -456,6 +458,8 @@ int codec_test_vectors(void) for (i=0; i<PJ_ARRAY_SIZE(enc_vectors); ++i) { PJ_LOG(3,(THIS_FILE," %s @%d bps", enc_vectors[i].codec_name, enc_vectors[i].bit_rate)); + if (!enc_vectors[i].codec_name) + continue; rc = codec_test_encode(mgr, enc_vectors[i].codec_name, enc_vectors[i].bit_rate, enc_vectors[i].wav_file, @@ -468,6 +472,8 @@ int codec_test_vectors(void) for (i=0; i<PJ_ARRAY_SIZE(dec_vectors); ++i) { PJ_LOG(3,(THIS_FILE," %s @%d bps", dec_vectors[i].codec_name, dec_vectors[i].bit_rate)); + if (!dec_vectors[i].codec_name) + continue; rc = codec_test_decode(mgr, dec_vectors[i].codec_name, dec_vectors[i].bit_rate, dec_vectors[i].encoded_frame_len, |