Changeset 3982 for pjproject/trunk/pjmedia/src/test/mips_test.c

Timestamp:

Mar 22, 2012 9:56:52 AM (13 years ago)

Author:

bennylp

Message:

Re: #1463 (Third party media support). Tnitial work and it works, tested on Linux. Details:

• add PJSUA_MEDIA_HAS_PJMEDIA macro
• move pjmedia specific implementation in pjsua_media.c and pjsua_call.c into pjsua_aud.c
• add pjsip-apps/src/third_party_media sample containing:
  • alt_pjsua_aud.c
  • alt_pjsua_vid.c
• moved pjmedia_vid_stream_info_from_sdp() into pjmedia/vid_stream_info.c
• moved pjmedia_stream_info_from_sdp() into pjmedia/stream_info.c
• misc: fixed mips_test.c if codecs are disabled

File:

• pjproject/trunk/pjmedia/src/test/mips_test.c (modified) (10 diffs)

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

@@ -794 +794 @@
 }
 
+#if PJMEDIA_HAS_G711_CODEC
 /* G.711 benchmark */
 static pjmedia_port* g711_encode_decode(  pj_pool_t *pool,
@@ -807 +808 @@
                                samples_per_frame, flags, te);
 }
+#endif
 
 /* GSM benchmark */
+#if PJMEDIA_HAS_GSM_CODEC
 static pjmedia_port* gsm_encode_decode(  pj_pool_t *pool,
                                          unsigned clock_rate,
@@ -821 +824 @@
                                samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_ILBC_CODEC
 static pj_status_t ilbc_init(pjmedia_endpt *endpt)
 {
@@ -840 +845 @@
                                channel_count, samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_SPEEX_CODEC
 /* Speex narrowband benchmark */
 static pjmedia_port* speex8_encode_decode(pj_pool_t *pool,
@@ -870 +877 @@
                                samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_G722_CODEC
 /* G.722 benchmark benchmark */
 static pjmedia_port* g722_encode_decode(pj_pool_t *pool,
@@ -884 +893 @@
                                samples_per_frame, flags, te);
 }
+#endif
 
 #if PJMEDIA_HAS_G7221_CODEC
@@ -1797 +1807 @@
 }
 
+#if PJMEDIA_HAS_G711_CODEC
 /* G.711 stream, no SRTP */
 static pjmedia_port* create_stream_pcmu( pj_pool_t *pool,
@@ -1871 +1882 @@
                          samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_GSM_CODEC
 /* GSM stream */
 static pjmedia_port* create_stream_gsm(  pj_pool_t *pool,
@@ -1946 +1959 @@
                          samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_G722_CODEC
 /* G722 stream */
 static pjmedia_port* create_stream_g722( pj_pool_t *pool,
@@ -1961 +1976 @@
                          samples_per_frame, flags, te);
 }
-
+#endif
+
+#if PJMEDIA_HAS_G7221_CODEC
 /* G722.1 stream */
-#if PJMEDIA_HAS_G7221_CODEC
 static pjmedia_port* create_stream_g7221( pj_pool_t *pool,
                                           unsigned clock_rate,