Changeset 141:c48f25fd6495

Timestamp:

02/12/07 14:22:38 (2 years ago)

Author:

vadim@mbdsys.com

Parents:

119:478ba0a42f27 140:fc10cb48c375

Message:

Merge with verona.int

Files:

• SConstruct (modified) (2 diffs)
• ortp/src/rtpsession.c (modified) (7 diffs)
• ortp/src/rtpsession.c (modified) (1 diff)
• phapi/phapi.c (modified) (1 diff)
• phapi/phapi.c (modified) (4 diffs)
• phapi/phapi.h (modified) (2 diffs)
• phapi/phapi.h (modified) (1 diff)

SConstruct

@@ -7 +7 @@
-        BoolOption('video', "Enable Video Support", True),
-        BoolOption('ssl', "Enable SSL support",  True),
-Tru
+Fals
-        BoolOption('netlib',  "Enable netlib module support", False),
-Fals
+Tru
-        BoolOption('phapi_video_hack', "enable VIDEO HACK", False),
-Tru
-Tru
+Fals
+Fals
-        BoolOption('libsamplerate', "Enable usage of libsamplerate", False),
-        BoolOption('phapi_audio_arts', "Build PortAudio/arts support",  False),
@@ -26 +26 @@
-        BoolOption('debug', "Enable debug build", True),
-        BoolOption('qos_debug', "Enable QoS debugging functionality", False),
-
+
+
-        ('target_os', "Target platform", sys.platform),
-        ('VERONA_VERSION', "Software version", "0.0.2")

ortp/src/rtpsession.c

@@ -32 +32 @@
-#include <sys/socket.h>
-#include <netinet/in.h>
+#include <netinet/ip.h>
-#include <arpa/inet.h>
-#ifdef INET6
@@ -65 +66 @@
-
-
+#define USING_QOS(s) ((s)->flags & RTP_SESSION_USING_QOS)
-#define USING_TUNNEL(s) ((s)->flags & RTP_SESSION_USING_TUNNELS)
-#define TUNNEL_SEND(t, b, l) ((t)->tunnel_send((t)->h_tunnel, b, l))
@@ -86 +88 @@
-{
-  session->markbit = mark;
+}
+void
+rtp_session_set_qos (RtpSession * session, int qos)
+{
+  session->qos = IPTOS_TOS(qos);
+  session->flags |= RTP_SESSION_USING_QOS;
-}
-
@@ -617 +625 @@
-                     getSocketError ());
-        }
+      /* set the TOS bits if needed address reusable */
+
+      if(USING_QOS(session))
+        {
+          gint tosval = session->qos;
+          err = setsockopt (session->rtp.socket, SOL_IP, IP_TOS,
+                        (void *) &tosval, sizeof (tosval));
+          if (err < 0)
+            {
+              g_warning ("Fail to set rtp address reusable: %s.",
+                     getSocketError ());
+            }
+        }
-    }
-
@@ -647 +668 @@
-          g_warning ("Fail to set rtcp address reusable: %s.",
-                     getSocketError ());
+        }
+      /* set the TOS bits if needed address reusable */
+
+      if(USING_QOS(session))
+        {
+          gint tosval = session->qos;
+          err = setsockopt (session->rtcp.socket, SOL_IP, IP_TOS,
+                        (void *) &tosval, sizeof (tosval));
+          if (err < 0)
+            {
+              g_warning ("Fail to set rtp address reusable: %s.",
+                     getSocketError ());
+            }
-        }
-
@@ -883 +917 @@
-  session->rtcp.socket = rtcpfd;
-  session->flags |= RTP_SESSION_USING_EXT_SOCKETS;
+
+  /* set the TOS bits if needed address reusable */
+
+  if(USING_QOS(session))
+    {
+      gint err;
+      gint tosval = session->qos;
+      err = setsockopt (session->rtp.socket, SOL_IP, IP_TOS,
+                        (void *) &tosval, sizeof (tosval));
+      if (err < 0)
+        {
+          g_warning ("Fail to set TOS %x on rtp socket: %s.", tosval, getSocketError ());
+        }
+      err = setsockopt (session->rtcp.socket, SOL_IP, IP_TOS,
+                        (void *) &tosval, sizeof (tosval));
+      if (err < 0)
+        {
+          g_warning ("Fail to set TOS %x on rtcp socket: %s.", tosval, getSocketError ());
+        }
+    }
+
+
-#ifdef RTCP
-//<JT>
@@ -1274 +1330 @@
-  RtpScheduler *sched;
-#endif
-
-  if (session->flags & RTP_SESSION_SEND_NOT_STARTED)
-    {

ortp/src/rtpsession.c

@@ -1353 +1353 @@
-  rtp_session_lock (session);
-
+  timestamp += session->base_timestamp;
-  /* set a seq number */
-  rtp->seq_number = session->rtp.snd_seq;

phapi/phapi.c

@@ -3410 +3410 @@
-    if (s->newstreams | s->activestreams)
-      {
+        s->qos = phcfg.qos;
+
-        if (!ca->audiodev)
-          ca->audiodev = phcfg.audio_dev;

phapi/phapi.c

@@ -58 +58 @@
-#define strcasecmp stricmp
-#define usleep(usecs) Sleep((usecs)/1000)
+#define random rand
-#endif
-
@@ -444 +445 @@
-  buf[0] = 0;
-
+  if (port == -1)
+    port = 10600 + random() % 4096;
-
-  while(1)
@@ -460 +463 @@
-_get_local_video_sdp_port(char buf[]) 
-{
- + 2
+
-  int i;
-
-
-  buf[0] = 0;
+
+  if (port == -1)
+    port = 10600 + random() % 4096;
+  else
+    port += 2;
+
+
-
-  while(1)
@@ -3593 +3603 @@
-    if (rca)
-    {
-Answered
+OK
-    }
-

phapi/phapi.h

@@ -968 +968 @@
-  int softboost;            /* to be removed */
-  int nomedia;
-               
+    
-  unsigned int vad;         /* if bit31=1  DTX/VAD features activated and bits0-30 contains the power threshold */
-  int cng;                  /* if 1,  CNG feature will be negotiated */
@@ -999 +999 @@
-  struct phVideoConfig video_config;
-  char  plugin_path[256];  /*!< where to look for plugin modules */
+  int qos;                  /* QoS bits to add to TOS to : 0x2 min cost, 0x4 max reliability, 0x8 max throughput, 0x10 min delay */
+  unsigned int hdxlevel;    /* if bit31=1  HDX level is valid and bits0-30 contains the power threshold */
-};
-#endif

phapi/phapi.h

@@ -168 +168 @@
-#define PH_STREAM_VIDEO_RX (1 << 1)
-#define PH_STREAM_VIDEO_TX (1 << 2)
-
+
+
-
-/********************TELEPHONY*********************/