Changeset 3667 for pjproject

Timestamp:

Jul 19, 2011 11:11:07 AM (13 years ago)

Author:

nanang

Message:

Fixed #1271: protected all video features with PJMEDIA_HAS_VIDEO macro setting.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-codec/ffmpeg_codecs.c (modified) (1 diff)
• pjmedia/src/pjmedia-codec/h263_packetizer.c (modified) (2 diffs)
• pjmedia/src/pjmedia-codec/h264_packetizer.c (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/colorbar_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/dshow_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/dshowclasses.cpp (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/errno.c (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/ffmpeg_dev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/videodev.c (modified) (2 diffs)
• pjmedia/src/pjmedia/avi_player.c (modified) (2 diffs)
• pjmedia/src/pjmedia/endpoint.c (modified) (5 diffs)
• pjmedia/src/pjmedia/format.c (modified) (5 diffs)
• pjmedia/src/pjmedia/vid_codec.c (modified) (2 diffs)
• pjmedia/src/pjmedia/vid_codec_util.c (modified) (2 diffs)
• pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (2 diffs)
• pjmedia/src/pjmedia/vid_tee.c (modified) (2 diffs)
• pjmedia/src/test/test.c (modified) (2 diffs)
• pjmedia/src/test/test.h (modified) (1 diff)
• pjmedia/src/test/vid_codec_test.c (modified) (2 diffs)
• pjmedia/src/test/vid_dev_test.c (modified) (2 diffs)
• pjmedia/src/test/vid_port_test.c (modified) (2 diffs)
• pjsip-apps/src/samples/aviplay.c (modified) (2 diffs)
• pjsip-apps/src/samples/simpleua.c (modified) (7 diffs)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_dump.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -32 +32 @@
 
 /*
- * Only build this file if PJMEDIA_HAS_FFMPEG_CODEC != 0
- */
-#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0
+ * Only build this file if PJMEDIA_HAS_FFMPEG_CODEC != 0 and 
+ * PJMEDIA_HAS_VIDEO != 0
+ */
+#if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC != 0 && \
+    defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
 #define THIS_FILE   "ffmpeg_codecs.c"

pjproject/trunk/pjmedia/src/pjmedia-codec/h263_packetizer.c

@@ -22 +22 @@
 #include <pj/errno.h>
 #include <pj/string.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #define THIS_FILE       "h263_packetizer.c"
@@ -286 +290 @@
     return PJ_SUCCESS;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia-codec/h264_packetizer.c

@@ -25 +25 @@
 #include <pj/string.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE               "h264_packetizer.c"
 
@@ -529 +533 @@
     return PJ_SUCCESS;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia-videodev/colorbar_dev.c

@@ -23 +23 @@
 #include <pj/rand.h>
 
-#if PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC) && \
+    PJMEDIA_VIDEO_DEV_HAS_CBAR_SRC != 0
+
 
 #define THIS_FILE               "colorbar_dev.c"

pjproject/trunk/pjmedia/src/pjmedia-videodev/dshow_dev.c

@@ -23 +23 @@
 #include <pj/unicode.h>
 
-#if PJMEDIA_VIDEO_DEV_HAS_DSHOW
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
+
 
 #ifdef _MSC_VER

pjproject/trunk/pjmedia/src/pjmedia-videodev/dshowclasses.cpp

@@ -20 +20 @@
 #include <pjmedia-videodev/config.h>
 
-#if PJMEDIA_VIDEO_DEV_HAS_DSHOW
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
+
 
 #include <assert.h>
@@ -243 +245 @@
 }
 
+
 #endif  /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */

pjproject/trunk/pjmedia/src/pjmedia-videodev/errno.c

@@ -25 +25 @@
  * Message must be limited to 64 chars!
  */
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0)
@@ -111 +115 @@
     return errstr;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia-videodev/ffmpeg_dev.c

@@ -38 +38 @@
 #include <pj/unicode.h>
 
-#if PJMEDIA_VIDEO_DEV_HAS_FFMPEG
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_FFMPEG) && PJMEDIA_VIDEO_DEV_HAS_FFMPEG != 0
+
 
 #define THIS_FILE               "ffmpeg.c"
@@ -512 +514 @@
 #endif
 
+
 #endif  /* PJMEDIA_VIDEO_DEV_HAS_FFMPEG */

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -23 +23 @@
 #include <pj/os.h>
 
-#if PJMEDIA_VIDEO_DEV_HAS_SDL
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0
+
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
@@ -1289 +1291 @@
 #endif
 
+
 #endif  /* PJMEDIA_VIDEO_DEV_HAS_SDL */

pjproject/trunk/pjmedia/src/pjmedia-videodev/videodev.c

@@ -24 +24 @@
 #include <pj/string.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE   "videodev.c"
 
@@ -805 +809 @@
     return strm->op->destroy(strm);
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/avi_player.c

@@ -31 +31 @@
 #include <pj/pool.h>
 #include <pj/string.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
 
@@ -710 +713 @@
     return PJ_SUCCESS;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -524 +524 @@
 }
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 /* Create m=video SDP media line */
 PJ_DEF(pj_status_t) pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
@@ -531 +534 @@
                                                    pjmedia_sdp_media **p_m)
 {
+
+
     const pj_str_t STR_VIDEO = { "video", 5 };
     pjmedia_sdp_media *m;
@@ -662 +667 @@
 }
 
+#endif /* PJMEDIA_HAS_VIDEO */
+
 
 /**
@@ -730 +737 @@
     pjmedia_sdp_session *sdp;
     pjmedia_sdp_media *m;
-    unsigned i;
     pj_status_t status;
 
@@ -751 +757 @@
     sdp->media[sdp->media_count++] = m;
 
-    /* The remaining stream, if any, are videos (by convention as well) */
-    for (i=1; i<stream_cnt; ++i) {
-        status = pjmedia_endpt_create_video_sdp(endpt, pool,
-                                                &sock_info[i], 0, &m);
-        if (status != PJ_SUCCESS)
-            return status;
-        sdp->media[sdp->media_count++] = m;
-    }
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+    {
+        unsigned i;
+
+        /* The remaining stream, if any, are videos (by convention as well) */
+        for (i=1; i<stream_cnt; ++i) {
+            status = pjmedia_endpt_create_video_sdp(endpt, pool,
+                                                    &sock_info[i], 0, &m);
+            if (status != PJ_SUCCESS)
+                return status;
+            sdp->media[sdp->media_count++] = m;
+        }
+    }
+#endif
 
     /* Done */

pjproject/trunk/pjmedia/src/pjmedia/format.c

@@ -24 +24 @@
 #include <pj/string.h>
 
+
+PJ_DEF(void) pjmedia_format_init_audio( pjmedia_format *fmt,
+                                        pj_uint32_t fmt_id,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned bits_per_sample,
+                                        unsigned frame_time_usec,
+                                        pj_uint32_t avg_bps,
+                                        pj_uint32_t max_bps)
+{
+    fmt->id = fmt_id;
+    fmt->type = PJMEDIA_TYPE_AUDIO;
+    fmt->detail_type = PJMEDIA_FORMAT_DETAIL_AUDIO;
+
+    fmt->det.aud.clock_rate = clock_rate;
+    fmt->det.aud.channel_count = channel_count;
+    fmt->det.aud.bits_per_sample = bits_per_sample;
+    fmt->det.aud.frame_time_usec = frame_time_usec;
+    fmt->det.aud.avg_bps = avg_bps;
+    fmt->det.aud.max_bps = max_bps;
+}
+
+
+PJ_DEF(pjmedia_audio_format_detail*)
+pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
+                                       pj_bool_t assert_valid)
+{
+    if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
+        return (pjmedia_audio_format_detail*) &fmt->det.aud;
+    } else {
+        pj_assert(!assert_valid || !"Invalid audio format detail");
+        return NULL;
+    }
+}
+
+
+PJ_DEF(pjmedia_format*) pjmedia_format_copy(pjmedia_format *dst,
+                                            const pjmedia_format *src)
+{
+    return (pjmedia_format*)pj_memcpy(dst, src, sizeof(*src));
+}
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 static pj_status_t apply_packed_fmt(const pjmedia_video_format_info *fi,
                                     pjmedia_video_apply_fmt_param *aparam);
@@ -57 +103 @@
 };
 
-
-PJ_DEF(void) pjmedia_format_init_audio( pjmedia_format *fmt,
-                                        pj_uint32_t fmt_id,
-                                        unsigned clock_rate,
-                                        unsigned channel_count,
-                                        unsigned bits_per_sample,
-                                        unsigned frame_time_usec,
-                                        pj_uint32_t avg_bps,
-                                        pj_uint32_t max_bps)
-{
-    fmt->id = fmt_id;
-    fmt->type = PJMEDIA_TYPE_AUDIO;
-    fmt->detail_type = PJMEDIA_FORMAT_DETAIL_AUDIO;
-
-    fmt->det.aud.clock_rate = clock_rate;
-    fmt->det.aud.channel_count = channel_count;
-    fmt->det.aud.bits_per_sample = bits_per_sample;
-    fmt->det.aud.frame_time_usec = frame_time_usec;
-    fmt->det.aud.avg_bps = avg_bps;
-    fmt->det.aud.max_bps = max_bps;
-}
-
 PJ_DEF(void) pjmedia_format_init_video( pjmedia_format *fmt,
                                         pj_uint32_t fmt_id,
@@ -113 +137 @@
 }
 
-PJ_DEF(pjmedia_audio_format_detail*)
-pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
-                                       pj_bool_t assert_valid)
-{
-    if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
-        return (pjmedia_audio_format_detail*) &fmt->det.aud;
-    } else {
-        pj_assert(!assert_valid || !"Invalid audio format detail");
-        return NULL;
-    }
-}
-
 PJ_DEF(pjmedia_video_format_detail*)
 pjmedia_format_get_video_format_detail(const pjmedia_format *fmt,
@@ -135 +147 @@
         return NULL;
     }
-}
-
-PJ_DEF(pjmedia_format*) pjmedia_format_copy(pjmedia_format *dst,
-                                            const pjmedia_format *src)
-{
-    return (pjmedia_format*)pj_memcpy(dst, src, sizeof(*src));
 }
 
@@ -365 +371 @@
 }
 
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/vid_codec.c

@@ -25 +25 @@
 #include <pj/string.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE   "vid_codec.c"
 
@@ -730 +734 @@
 }
 
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

@@ -24 +24 @@
 #include <pj/ctype.h>
 #include <pj/math.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #define THIS_FILE   "vid_codec_util.c"
@@ -618 +622 @@
     return PJ_SUCCESS;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -25 +25 @@
 #include <pj/log.h>
 #include <pj/pool.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #define SIGNATURE       PJMEDIA_SIG_VID_PORT
@@ -947 +951 @@
     return status;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -39 +39 @@
 
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE                       "vid_stream.c"
 #define ERRLEVEL                        1
@@ -1939 +1942 @@
 }
 
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjmedia/src/pjmedia/vid_tee.c

@@ -24 +24 @@
 #include <pj/pool.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define TEE_PORT_NAME   "vid_tee"
 #define TEE_PORT_SIGN   PJMEDIA_SIG_PORT_VID_TEE
@@ -383 +387 @@
     return PJ_SUCCESS;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

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

@@ -59 +59 @@
     mem = &caching_pool.factory;
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
     pjmedia_converter_mgr_create(pool, NULL);
     pjmedia_vid_codec_mgr_create(pool, NULL);
+#endif
 
 #if HAS_VID_PORT_TEST
@@ -100 +102 @@
     }
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr_instance());
     pjmedia_converter_mgr_destroy(pjmedia_converter_mgr_instance());
     pjmedia_vid_codec_mgr_destroy(pjmedia_vid_codec_mgr_instance());
-    
+#endif
+
     pj_pool_release(pool);
     pj_caching_pool_destroy(&caching_pool);

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

@@ -24 +24 @@
 #include <pjlib.h>
 
-#define HAS_VID_DEV_TEST        1
-#define HAS_VID_PORT_TEST       0
-#define HAS_VID_CODEC_TEST      1
+#define HAS_VID_DEV_TEST        PJMEDIA_HAS_VIDEO
+#define HAS_VID_PORT_TEST       PJMEDIA_HAS_VIDEO
+#define HAS_VID_CODEC_TEST      PJMEDIA_HAS_VIDEO
 #define HAS_SDP_NEG_TEST        1
 #define HAS_JBUF_TEST           1

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

@@ -4 +4 @@
 #include <pjmedia/vid_codec.h>
 #include <pjmedia/port.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #define THIS_FILE "vid_codec.c"
@@ -466 +470 @@
 
 
+#endif /* PJMEDIA_HAS_VIDEO */

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

@@ -24 +24 @@
 #include <pjmedia_videodev.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE       "vid_dev_test.c"
 #define LOOP_DURATION   10
@@ -293 +297 @@
     return rc;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

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

@@ -24 +24 @@
 #include <pjmedia_videodev.h>
 
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+
 #define THIS_FILE       "vid_dev_test.c"
 #define LOOP_DURATION   6
@@ -240 +244 @@
     return rc;
 }
+
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjsip-apps/src/samples/aviplay.c

@@ -53 +53 @@
  *  aviplay FILE.AVI
  */
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
 
@@ -530 +533 @@
     return pj_run_app(&main_func, argc, argv, 0);
 }
+
+#else
+
+int main(int argc, char *argv[])
+{
+    PJ_UNUSED_ARG(argc);
+    PJ_UNUSED_ARG(argv);
+    puts("Error: this sample requires video capability (PJMEDIA_HAS_VIDEO == 1)");
+    return -1;
+}
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjsip-apps/src/samples/simpleua.c

@@ -104 +104 @@
 static pjmedia_snd_port     *g_snd_port;    /* Sound device.            */
 
-#if PJMEDIA_HAS_VIDEO
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 static pjmedia_vid_stream   *g_med_vstream; /* Call's video stream.     */
 static pjmedia_vid_port     *g_vid_capturer;/* Call's video capturer.   */
@@ -374 +374 @@
 
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     /* Init video subsystem */
-#if PJMEDIA_HAS_VIDEO
     pool = pjmedia_endpt_create_pool(g_med_endpt, "Video subsystem", 512, 512);
     status = pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
@@ -386 +386 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
 
-#  if PJMEDIA_HAS_FFMPEG_CODEC
+#  if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0
     /* Init ffmpeg video codecs */
     status = pjmedia_codec_ffmpeg_init(NULL, &cp.factory);
@@ -558 +558 @@
         pjmedia_snd_port_destroy(g_snd_port);
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     /* Destroy video ports */
-#if PJMEDIA_HAS_VIDEO
     if (g_vid_capturer)
         pjmedia_vid_port_destroy(g_vid_capturer);
@@ -569 +569 @@
     if (g_med_stream)
         pjmedia_stream_destroy(g_med_stream);
-#if PJMEDIA_HAS_VIDEO
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     if (g_med_vstream)
         pjmedia_vid_stream_destroy(g_med_vstream);
+
+    /* Deinit ffmpeg codec */
+#   if defined(PJMEDIA_HAS_FFMPEG_CODEC) && PJMEDIA_HAS_FFMPEG_CODEC!=0
+    pjmedia_codec_ffmpeg_deinit();
+#   endif
+
 #endif
 
@@ -579 +585 @@
             pjmedia_transport_close(g_med_transport[i]);
     }
-
-    /* Deinit ffmpeg codec */
-#if PJMEDIA_HAS_FFMPEG_CODEC
-    pjmedia_codec_ffmpeg_deinit();
-#endif
 
     /* Deinit pjmedia endpoint */
@@ -886 +887 @@
      * the port directly to a renderer/capture video device.
      */
-#if PJMEDIA_HAS_VIDEO
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     if (local_sdp->media_count > 1) {
         pjmedia_vid_stream_info vstream_info;

pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

@@ -35 +35 @@
 #include <pjmedia-codec.h>
 #include <pjmedia/transport_srtp.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
 
 #include <stdlib.h>     /* atoi() */
@@ -928 +932 @@
     return (status == PJ_SUCCESS) ? 0 : 1;
 }
+
+
+#else
+
+int main(int argc, char *argv[])
+{
+    PJ_UNUSED_ARG(argc);
+    PJ_UNUSED_ARG(argv);
+    puts("Error: this sample requires video capability (PJMEDIA_HAS_VIDEO == 1)");
+    return -1;
+}
+
+#endif /* PJMEDIA_HAS_VIDEO */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -383 +383 @@
     PJ_ASSERT_RETURN(pjsua_var.tpdata[0].data.ptr != NULL, PJ_EINVALIDOP);
 
+    /* Verify media count */
+#if !defined(PJMEDIA_HAS_VIDEO) || (PJMEDIA_HAS_VIDEO == 0)
+    PJ_ASSERT_RETURN(cfg->max_video_cnt == 0, PJ_EINVAL);
+#endif
+    PJ_ASSERT_RETURN(cfg->max_audio_cnt + cfg->max_video_cnt <= 
+                     PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY);
+
     PJSUA_LOCK();
 
@@ -641 +648 @@
     PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc),
                      PJ_EINVAL);
+
+    /* Verify media count */
+#if !defined(PJMEDIA_HAS_VIDEO) || (PJMEDIA_HAS_VIDEO == 0)
+    PJ_ASSERT_RETURN(cfg->max_video_cnt == 0, PJ_EINVAL);
+#endif
+    PJ_ASSERT_RETURN(cfg->max_audio_cnt + cfg->max_video_cnt <= 
+                     PJSUA_MAX_CALL_MEDIA, PJ_ETOOMANY);
+
 
     PJSUA_LOCK();

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1466 +1466 @@
                                          &psi->info.aud);
         break;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     case PJMEDIA_TYPE_VIDEO:
         status = pjmedia_vid_stream_get_info(call_med->strm.v.stream,
                                              &psi->info.vid);
         break;
+#endif
     default:
         status = PJMEDIA_EINVALIMEDIATYPE;
@@ -1513 +1515 @@
                                                   &stat->jbuf);
         break;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     case PJMEDIA_TYPE_VIDEO:
         status = pjmedia_vid_stream_get_stat(call_med->strm.v.stream,
@@ -1520 +1523 @@
                                                   &stat->jbuf);
         break;
+#endif
     default:
         status = PJMEDIA_EINVALIMEDIATYPE;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_dump.c

@@ -313 +313 @@
                              info.param->setting.frm_per_pkt*
                              info.param->info.frm_ptime);
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         } else if (call_med->type == PJMEDIA_TYPE_VIDEO) {
             pjmedia_vid_stream *stream = call_med->strm.v.stream;
@@ -344 +346 @@
                                  vfd->fps.num*1.0/vfd->fps.denum);
             }
+#endif /* PJMEDIA_HAS_VIDEO */
+
         } else {
             has_stat = PJ_FALSE;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1248 +1248 @@
         call_med->tp_st = PJSUA_MED_TP_IDLE;
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         /* While in initial call, set default video devices */
         if (type == PJMEDIA_TYPE_VIDEO) {
@@ -1263 +1264 @@
             }
         }
+#endif
+
     } else if (call_med->tp_st == PJSUA_MED_TP_DISABLED) {
         /* Media is being reenabled. */
@@ -1651 +1654 @@
                                                     &tpinfo.sock_info, 0, &m);
             break;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         case PJMEDIA_TYPE_VIDEO:
             status = pjmedia_endpt_create_video_sdp(pjsua_var.med_endpt, pool,
                                                     &tpinfo.sock_info, 0, &m);
             break;
+#endif
         default:
             pj_assert(!"Invalid call_med media type");
@@ -2125 +2130 @@
             }
             break;
-#if PJMEDIA_HAS_VIDEO
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         case PJMEDIA_TYPE_VIDEO:
             status = video_channel_update(call_med, tmp_pool,