Changeset 3667 for pjproject/trunk/pjsip-apps/src/samples/simpleua.c

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.

File:

• pjproject/trunk/pjsip-apps/src/samples/simpleua.c (modified) (7 diffs)

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;