diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-01-27 10:05:48 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-01-27 10:05:48 +0000 |
| commit | 52d745a93b3da26bc2f437be671d0a7e30de0f62 (patch) | |
| tree | 9a9dbcc1c197022f39ac8b9f28010232e01cfae4 | |
| parent | 510545acc94b2064ffc7f40d04d8531284625fc9 (diff) | |
Ticket #707: pjmedia-test: link error when L16 codec is disabled, and compile error due to Unicode platform in sdp_test
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2429 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/test/mips_test.c | 4 | ||||
| -rw-r--r-- | pjmedia/src/test/sdp_neg_test.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pjmedia/src/test/mips_test.c b/pjmedia/src/test/mips_test.c index 79144725..0b041f77 100644 --- a/pjmedia/src/test/mips_test.c +++ b/pjmedia/src/test/mips_test.c @@ -881,6 +881,7 @@ static pjmedia_port* g722_encode_decode(pj_pool_t *pool, samples_per_frame, flags, te); } +#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 static pj_status_t init_l16_default(pjmedia_endpt *endpt) { return pjmedia_codec_l16_init(endpt, 0); @@ -913,6 +914,7 @@ static pjmedia_port* l16_16_encode_decode(pj_pool_t *pool, clock_rate, channel_count, samples_per_frame, flags, te); } +#endif /***************************************************************************/ /* WSOLA PLC mode */ @@ -2279,8 +2281,10 @@ int mips_test(void) { "codec encode/decode - iLBC", OP_PUT, K8, &ilbc_encode_decode}, { "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}, { "stream TX/RX - G.711 SRTP 32bit +auth", OP_PUT_GET, K8, &create_stream_pcmu_srtp32_with_auth}, diff --git a/pjmedia/src/test/sdp_neg_test.c b/pjmedia/src/test/sdp_neg_test.c index f973f0a2..521fbf2d 100644 --- a/pjmedia/src/test/sdp_neg_test.c +++ b/pjmedia/src/test/sdp_neg_test.c @@ -1328,7 +1328,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, pjmedia_sdp_neg *neg; 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) { app_perror(status, " error: unexpected parse status for sdp1"); @@ -1370,7 +1370,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* 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) { app_perror(status, " error: parsing sdp2"); @@ -1405,7 +1405,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* 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) { app_perror(status, " error: parsing sdp3"); @@ -1447,7 +1447,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, 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) { app_perror(status, " error: parsing sdp2"); @@ -1507,7 +1507,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* 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) { app_perror(status, " error: parsing sdp3"); |