More ticket #774: updated VS6, VS8, and Makefile for the Siren7/Siren14 test vectors
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@2614 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index c0915b4..6e3a9a2 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -103,7 +103,7 @@
# 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 786483f..b551497 100644
--- a/pjmedia/build/pjmedia_test.dsp
+++ b/pjmedia/build/pjmedia_test.dsp
@@ -87,6 +87,10 @@
# 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 4eac925..2433665 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 11d2f23..dc6333c 100644
--- a/pjmedia/src/test/codec_vectors.c
+++ b/pjmedia/src/test/codec_vectors.c
@@ -412,6 +412,7 @@
"../src/test/vectors/g722_1_enc_out_32000_be.pak"
},
#endif
+ { NULL }
};
struct dec_vectors {
char *codec_name;
@@ -434,6 +435,7 @@
"../src/test/vectors/g722_1_dec_out_32000.pcm"
},
#endif
+ { NULL }
};
unsigned i;
pj_status_t status;
@@ -456,6 +458,8 @@
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 @@
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,