Changeset 2882 for pjproject/trunk

Timestamp:

Aug 15, 2009 10:05:36 AM (15 years ago)

Author:

bennylp

Message:

Ticket #944: misc fixes in pjmedia_test:

• Assertion in pjmedia tests's MIPS test with iLBC codec due to ptime mismatch
• added compile time macro in test.h to enable/disable specific tests
• also added SVN keyword expansion attributes to the source files

Location:

pjproject/trunk/pjmedia/src/test

Files:

• audio_tool.c (modified) (1 prop)
• jbuf_test.c (modified) (1 prop)
• mips_test.c (modified) (3 diffs)
• rtp_test.c (modified) (1 prop)
• sdptest.c (modified) (1 prop)
• session_test.c (modified) (1 prop)
• test.c (modified) (1 diff, 1 prop)
• test.h (modified) (1 diff)
• wince_main.c (modified) (1 prop)

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

@@ -388 +388 @@
     unsigned         valid_op;
     unsigned         valid_clock_rate;
+
     pjmedia_port*  (*init)(pj_pool_t *pool,
                           unsigned clock_rate,
@@ -834 +835 @@
                                          struct test_entry *te)
 {
+    samples_per_frame = 30 * clock_rate / 1000;
     return codec_encode_decode(pool, "ilbc", &ilbc_init, 
                                &pjmedia_codec_ilbc_deinit, clock_rate, 
@@ -2216 +2218 @@
         return t0;
     }
+
+    /* Port may decide to use different ptime (e.g. iLBC) */
+    samples_per_frame = port->info.samples_per_frame;
 
     gen_port = create_gen_port(pool, clock_rate, 1, 

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

@@ -57 +57 @@
     mem = &caching_pool.factory;
 
+#if HAS_SDP_NEG_TEST
     DO_TEST(sdp_neg_test());
+#endif
     //DO_TEST(sdp_test (&caching_pool.factory));
     //DO_TEST(rtp_test(&caching_pool.factory));
     //DO_TEST(session_test (&caching_pool.factory));
+#if HAS_JBUF_TEST
     DO_TEST(jbuf_main());
+#endif
+#if HAS_MIPS_TEST
     DO_TEST(mips_test());
+#endif
+#if HAS_CODEC_VECTOR_TEST
     DO_TEST(codec_test_vectors());
+#endif
 
     PJ_LOG(3,(THIS_FILE," "));

pjproject/trunk/pjmedia/src/test/test.h

@@ -24 +24 @@
 #include <pjlib.h>
 
+#define HAS_SDP_NEG_TEST        1
+#define HAS_JBUF_TEST           1
+#define HAS_MIPS_TEST           1
+#define HAS_CODEC_VECTOR_TEST   1
 
 int session_test(void);