[Linphone-developers] --disable-video option

[Jason Hennigar]

Hi All,

In order to get the latest Linphone CVS version to build with the 
--disable-video option I had to make the changes shown in the attached diff.

Cheers!
Jason

Index: oRTP/include/ortp/payloadtype.h
===================================================================
--- oRTP/include/ortp/payloadtype.h
+++ oRTP/include/ortp/payloadtype.h     (working copy)
@@ -186,6 +186,7 @@
 VAR_DECLSPEC PayloadType payload_type_h263_2000;
 VAR_DECLSPEC PayloadType payload_type_mp4v;
 VAR_DECLSPEC PayloadType payload_type_theora;
+VAR_DECLSPEC PayloadType payload_type_x_snow;
 
 
 /* telephone-event */
Index: oRTP/src/avprofile.c
===================================================================
--- oRTP/src/avprofile.c
+++ oRTP/src/avprofile.c        (working copy)
@@ -380,6 +380,17 @@
        CHANNELS(0)
 };
 
+PayloadType payload_type_x_snow={
+   TYPE( PAYLOAD_VIDEO),
+       CLOCK_RATE(90000),
+       BITS_PER_SAMPLE(0),
+       ZERO_PATTERN(NULL),
+       PATTERN_LENGTH(0),
+       NORMAL_BITRATE(256000),
+       MIME_TYPE ("x-snow"),
+       CHANNELS(0)
+};
 
 
 
+
Index: mediastreamer2/src/videoenc.c
===================================================================
--- mediastreamer2/src/videoenc.c
+++ mediastreamer2/src/videoenc.c       (working copy)
@@ -581,17 +581,6 @@
 
 #endif
 
-PayloadType payload_type_x_snow={
-       PAYLOAD_VIDEO,
-       90000,
-       0,
-       NULL,
-       0,
-       256000,
-       "x-snow"
-};
-
-
 MS_FILTER_DESC_EXPORT(ms_mpeg4_enc_desc)
 MS_FILTER_DESC_EXPORT(ms_h263_enc_desc)
 MS_FILTER_DESC_EXPORT(ms_snow_enc_desc)
Index: coreapi/exevents.c
===================================================================
--- coreapi/exevents.c
+++ coreapi/exevents.c  (working copy)
@@ -747,9 +747,11 @@
                                if (body && body->body!=NULL &&
                                        
strstr(body->body,"picture_fast_update")){
                                        osip_message_t *ans=NULL;
+#ifdef VIDEO_ENABLED
                                        ms_message("Receiving VFU request !");
                                        if (lc->videostream)
                                                
video_stream_send_vfu(lc->videostream);
+#endif
                                        
eXosip_call_build_answer(ev->tid,200,&ans);
                                        if (ans)
                                                
eXosip_call_send_answer(ev->tid,200,ans);
Index: coreapi/linphonecore.c
===================================================================
--- coreapi/linphonecore.c
+++ coreapi/linphonecore.c      (working copy)
@@ -586,8 +586,6 @@
        return liblinphone_version;
 }
 
-extern PayloadType payload_type_x_snow;
-
 void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vtable, 
const char *config_path, void * userdata)
 {
        memset (lc, 0, sizeof (LinphoneCore));
@@ -605,11 +603,12 @@
        rtp_profile_set_payload(&av_profile,112,&payload_type_ilbc);
        rtp_profile_set_payload(&av_profile,116,&payload_type_truespeech);
        rtp_profile_set_payload(&av_profile,101,&payload_type_telephone_event);
-       
+#ifdef VIDEO_ENABLED   
        rtp_profile_set_payload(&av_profile,97,&payload_type_theora);
        rtp_profile_set_payload(&av_profile,98,&payload_type_h263_1998);
        rtp_profile_set_payload(&av_profile,99,&payload_type_mp4v);
        rtp_profile_set_payload(&av_profile,100,&payload_type_x_snow);
+#endif
 
        ms_init();
        
@@ -1665,7 +1664,7 @@
                snprintf(dtmf_body, 999, "Signal=%c\r\nDuration=250\r\n", dtmf);
                osip_message_set_body(msg,dtmf_body,strlen(dtmf_body));
                osip_message_set_content_type(msg,"application/dtmf-relay");
-               snprintf(clen,sizeof(clen),"%i",strlen(dtmf_body));
+               snprintf(clen,sizeof(clen),"%i",(int)strlen(dtmf_body));
                osip_message_set_content_length(msg,clen);
                
                eXosip_lock();
Index: console/linphonec.c
===================================================================
--- console/linphonec.c
+++ console/linphonec.c (working copy)
@@ -109,7 +109,9 @@
 //auto answer (-a) option
 static bool_t auto_answer=FALSE;
 static bool_t answer_call=FALSE;
+#ifdef VIDEO_ENABLED
 static bool_t video_enabled=FALSE;
+#endif
 static bool_t show_general_state=FALSE;
 LPC_AUTH_STACK auth_stack;
 static int trace_level = 0;
@@ -415,8 +417,10 @@
         */
        linphone_core_init (&linphonec, &linphonec_vtable, configfile_name,
                            NULL);
+   #ifdef VIDEO_ENABLED
        linphone_core_enable_video(&linphonec,video_enabled);
        if (!video_enabled) printf("Warning: video is disabled in linphonec. 
Run with -V option to enable it.\n");
+   #endif
        /*
         * Initialize readline
         */
@@ -781,10 +785,12 @@
                 {
                         auto_answer = TRUE;
                 }
+      #ifdef VIDEO_ENABLED
                else if (strncmp ("-V", argv[arg_num], 2) == 0)
                 {
                         video_enabled = TRUE;
                 }
+      #endif
                else if ((strncmp ("-v", argv[arg_num], 2) == 0)
                         ||
                         (strncmp