Changeset 3671

Timestamp:

Jul 20, 2011 3:05:03 AM (13 years ago)

Author:

nanang

Message:

Re #1324:

• Changed default value of PJMEDIA_HAS_VIDEO to disabled.
• Fixed code and build setting on Symbian for build correctness, it builds fine now.

Location:

pjproject/trunk

Files:

• build.symbian/pjmedia.mmp (modified) (6 diffs)
• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)

pjproject/trunk/build.symbian/pjmedia.mmp

@@ -46 +46 @@
 SOURCE          conference.c
 SOURCE          conf_switch.c
+SOURCE          delaybuf.c
 SOURCE          echo_common.c
 SOURCE          echo_port.c
@@ -51 +52 @@
 SOURCE          endpoint.c
 SOURCE          errno.c
-SOURCE          delaybuf.c
+SOURCE          event.c
+SOURCE          format.c
 SOURCE          g711.c
 SOURCE          jbuf.c
@@ -66 +68 @@
 SOURCE          rtp.c
 //SDP files are in pjsdp.mmp: sdp.c, sdp_cmp.c, sdp_neg.c
-SOURCE          session.c
+//SOURCE                session.c               // deprecated
 SOURCE          silencedet.c
 SOURCE          sound_port.c
@@ -72 +74 @@
 SOURCE          stereo_port.c
 SOURCE          stream.c
+SOURCE          stream_common.c
 SOURCE          tonegen.c
 SOURCE          transport_adapter_sample.c
@@ -77 +80 @@
 SOURCE          transport_udp.c
 SOURCE          transport_srtp.c
+SOURCE          types.c
 SOURCE          wav_player.c
 SOURCE          wav_playlist.c
@@ -82 +86 @@
 SOURCE          wave.c
 SOURCE          wsola.c
+
+//
+// pjmedia-codec common files
+//
+SOURCEPATH      ..\pjmedia\src\pjmedia-codec
+SOURCE          audio_codecs.c
+
 
 //

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -918 +918 @@
 
 /**
- * Top level option to disable video.
+ * Top level option to enable/disable video features.
+ *
+ * Default: 0 (disabled)
  */
 #ifndef PJMEDIA_HAS_VIDEO
-#   define PJMEDIA_HAS_VIDEO                            1
+#   define PJMEDIA_HAS_VIDEO                            0
 #endif
 

pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

@@ -503 +503 @@
     pjsua_acc_add_local(tid, PJ_TRUE, &g_acc_id);
 
+#if DISABLED_FOR_TICKET_1185
     /* Create media transports */
     pjsua_transport_config mtcfg;
@@ -514 +515 @@
         return status;
     }
+#endif
     
     /* Initialization is done, now start pjsua */