Changeset 2614 for pjproject/trunk

Timestamp:

Apr 18, 2009 12:34:45 AM (16 years ago)

Author:

bennylp

Message:

More ticket #774: updated VS6, VS8, and Makefile for the Siren7/Siren14 test vectors

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• build/pjmedia_test.dsp (modified) (1 diff)
• build/pjmedia_test.vcproj (modified) (1 diff)
• src/test/codec_vectors.c (modified) (4 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -104 +104 @@
 #
 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)

pjproject/trunk/pjmedia/build/pjmedia_test.dsp

@@ -88 +88 @@
 # Begin Source File
 
+SOURCE=..\src\test\codec_vectors.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\test\jbuf_test.c
 # End Source File

pjproject/trunk/pjmedia/build/pjmedia_test.vcproj

@@ -1050 +1050 @@
                         >
                         <File
+                                RelativePath="..\src\test\codec_vectors.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\test\jbuf_test.c"
                                 >

pjproject/trunk/pjmedia/src/test/codec_vectors.c

@@ -413 +413 @@
         },
 #endif
+        { NULL }
     };
     struct dec_vectors {
@@ -435 +436 @@
         },
 #endif
+        { NULL }
     };
     unsigned i;
@@ -457 +459 @@
         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,
@@ -469 +473 @@
         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,