Changeset 2429 for pjproject

Timestamp:

Jan 27, 2009 10:05:48 AM (16 years ago)

Author:

bennylp

Message:

Ticket #707: pjmedia-test: link error when L16 codec is disabled, and compile error due to Unicode platform in sdp_test

Location:

pjproject/trunk/pjmedia/src/test

Files:

• mips_test.c (modified) (3 diffs)
• sdp_neg_test.c (modified) (5 diffs)

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

@@ -882 +882 @@
 }
 
+#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
 static pj_status_t init_l16_default(pjmedia_endpt *endpt)
 {
@@ -914 +915 @@
                                samples_per_frame, flags, te);
 }
+#endif
 
 /***************************************************************************/
@@ -2280 +2282 @@
         { "codec encode/decode - Speex 8Khz", OP_PUT, K8, &speex8_encode_decode},
         { "codec encode/decode - Speex 16Khz", OP_PUT, K16, &speex16_encode_decode},
+#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0
         { "codec encode/decode - L16/8000/1", OP_PUT, K8, &l16_8_encode_decode},
         { "codec encode/decode - L16/16000/1", OP_PUT, K16, &l16_16_encode_decode},
+#endif
         { "stream TX/RX - G.711", OP_PUT_GET, K8, &create_stream_pcmu},
         { "stream TX/RX - G.711 SRTP 32bit", OP_PUT_GET, K8, &create_stream_pcmu_srtp32_no_auth},

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

@@ -1329 +1329 @@
     pj_status_t status;
 
-    status = pjmedia_sdp_parse(pool, oa->sdp1, pj_native_strlen(oa->sdp1),
+    status = pjmedia_sdp_parse(pool, oa->sdp1, pj_ansi_strlen(oa->sdp1),
                                 &sdp1);
     if (status != PJ_SUCCESS) {
@@ -1371 +1371 @@
 
         /* Parse and validate remote answer */
-        status = pjmedia_sdp_parse(pool, oa->sdp2, pj_native_strlen(oa->sdp2),
+        status = pjmedia_sdp_parse(pool, oa->sdp2, pj_ansi_strlen(oa->sdp2),
                                    &sdp2);
         if (status != PJ_SUCCESS) {
@@ -1406 +1406 @@
 
         /* Parse and validate the correct active media. */
-        status = pjmedia_sdp_parse(pool, oa->sdp3, pj_native_strlen(oa->sdp3),
+        status = pjmedia_sdp_parse(pool, oa->sdp3, pj_ansi_strlen(oa->sdp3),
                                    &sdp3);
         if (status != PJ_SUCCESS) {
@@ -1448 +1448 @@
         if (oa->sdp2) {
             /* Parse and validate initial local capability */
-            status = pjmedia_sdp_parse(pool, oa->sdp2, pj_native_strlen(oa->sdp2),
+            status = pjmedia_sdp_parse(pool, oa->sdp2, pj_ansi_strlen(oa->sdp2),
                                        &sdp2);
             if (status != PJ_SUCCESS) {
@@ -1508 +1508 @@
 
         /* Parse the correct answer. */
-        status = pjmedia_sdp_parse(pool, oa->sdp3, pj_native_strlen(oa->sdp3),
+        status = pjmedia_sdp_parse(pool, oa->sdp3, pj_ansi_strlen(oa->sdp3),
                                    &sdp3);
         if (status != PJ_SUCCESS) {