asf: fix compilation warning.

[vlc] / modules / demux / rtp.c

diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c
index 8f917efce2ee6cdc4ad55d073cf54f6cf4499c29..5978918c09aab433d6c3cc1c613c4805b240d1bc 100644 (file)
--- a/modules/demux/rtp.c
+++ b/modules/demux/rtp.c
@@ -83,7 +83,7 @@ vlc_module_begin ();
     set_description (_("(Experimental) Real-Time Protocol demuxer"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_DEMUX);
-    set_capability ("access_demux", 10);
+    set_capability ("access_demux", 0);
     set_callbacks (Open, Close);
 
     add_integer ("rtp-caching", 1000, NULL, RTP_CACHING_TEXT,
@@ -176,14 +176,18 @@ static int Open (vlc_object_t *obj)
         dport = 5004; /* avt-profile-1 port */
 
     /* Try to connect */
-    int fd = -1;
+    int fd = -1, rtcp_fd = -1;
 
     switch (tp)
     {
         case IPPROTO_UDP:
         case IPPROTO_UDPLITE:
-            fd = net_OpenDgram (obj, dhost, dport, shost, sport, AF_UNSPEC,
-                                tp);
+            fd = net_OpenDgram (obj, dhost, (dport + 1) & ~1,
+                                shost, (sport + 1) & ~1, AF_UNSPEC, tp);
+            if (fd == -1)
+                break;
+            rtcp_fd = net_OpenDgram (obj, dhost, dport | 1, shost,
+                                     sport ? (sport | 1) : 0, AF_UNSPEC, tp);
             break;
 
          case IPPROTO_DCCP:
@@ -194,15 +198,15 @@ static int Open (vlc_object_t *obj)
 #endif
 #ifdef SOCK_DCCP
             var_Create (obj, "dccp-service", VLC_VAR_STRING);
-            var_SetString (obj, "dccp-service", "RTPV");
-            fd = net_Connect (obj, shost, sport, SOCK_DCCP, tp);
+            var_SetString (obj, "dccp-service", "RTPV"); /* FIXME: RTPA? */
+            fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_DCCP, tp);
 #else
             msg_Err (obj, "DCCP support not included");
 #endif
             break;
 
         case IPPROTO_TCP:
-            fd = net_Connect (obj, shost, sport, SOCK_STREAM, tp);
+            fd = net_Connect (obj, shost, (sport + 1) & ~1, SOCK_STREAM, tp);
             break;
     }
 
@@ -216,11 +220,14 @@ static int Open (vlc_object_t *obj)
     if (p_sys == NULL)
     {
         net_Close (fd);
+        if (rtcp_fd != -1)
+            net_Close (rtcp_fd);
         return VLC_EGENERIC;
     }
 
     p_sys->srtp         = NULL;
     p_sys->fd           = fd;
+    p_sys->rtcp_fd      = rtcp_fd;
     p_sys->caching      = var_CreateGetInteger (obj, "rtp-caching");
     p_sys->max_src      = var_CreateGetInteger (obj, "rtp-max-src");
     p_sys->timeout      = var_CreateGetInteger (obj, "rtp-timeout");
@@ -237,18 +244,18 @@ static int Open (vlc_object_t *obj)
     if (p_sys->session == NULL)
         goto error;
 
-    char *key = var_GetNonEmptyString (demux, "srtp-key");
+    char *key = var_CreateGetNonEmptyString (demux, "srtp-key");
     if (key)
     {
         p_sys->srtp = srtp_create (SRTP_ENCR_AES_CM, SRTP_AUTH_HMAC_SHA1, 10,
-                                   SRTP_PRF_AES_CM, 0);
+                                   SRTP_PRF_AES_CM, SRTP_RCC_MODE1);
         if (p_sys->srtp == NULL)
         {
             free (key);
             goto error;
         }
 
-        char *salt = var_GetNonEmptyString (demux, "srtp-salt");
+        char *salt = var_CreateGetNonEmptyString (demux, "srtp-salt");
         errno = srtp_setkeystring (p_sys->srtp, key, salt ? salt : "");
         free (salt);
         free (key);
@@ -279,6 +286,8 @@ static void Close (vlc_object_t *obj)
         srtp_destroy (p_sys->srtp);
     if (p_sys->session)
         rtp_session_destroy (demux, p_sys->session);
+    if (p_sys->rtcp_fd != -1)
+        net_Close (p_sys->rtcp_fd);
     net_Close (p_sys->fd);
     free (p_sys);
 }
@@ -297,7 +306,7 @@ static int extract_port (char **phost)
 
     if (host[0] == '[')
     {
-        host = *++phost; /* skip '[' */
+        host = ++*phost; /* skip '[' */
         port = strchr (host, ']');
         if (port)
             *port++ = '\0'; /* skip ']' */
@@ -325,7 +334,7 @@ static int Control (demux_t *demux, int i_query, va_list args)
         {
             float *v = va_arg (args, float *);
             *v = 0.;
-            return 0;
+            return VLC_SUCCESS;
         }
 
         case DEMUX_GET_LENGTH:
@@ -333,14 +342,23 @@ static int Control (demux_t *demux, int i_query, va_list args)
         {
             int64_t *v = va_arg (args, int64_t *);
             *v = 0;
-            return 0;
+            return VLC_SUCCESS;
         }
 
         case DEMUX_GET_PTS_DELAY:
         {
             int64_t *v = va_arg (args, int64_t *);
-            *v = p_sys->caching;
-            return 0;
+            *v = p_sys->caching * 1000;
+            return VLC_SUCCESS;
+        }
+
+        case DEMUX_CAN_PAUSE:
+        case DEMUX_CAN_SEEK:
+        case DEMUX_CAN_CONTROL_PACE:
+        {
+            bool *v = (bool*)va_arg( args, bool * );
+            *v = false;
+            return VLC_SUCCESS;
         }
     }
 
@@ -372,7 +390,7 @@ static block_t *rtp_dgram_recv (demux_t *demux, int fd)
         len = net_Read (VLC_OBJECT (demux), fd, NULL,
                                 block->p_buffer, block->i_buffer, false);
         if (((len <= 0) && fd_dead (fd))
-         || demux->b_die)
+         || !vlc_object_alive (demux))
         {
             block_Release (block);
             return NULL;
@@ -444,8 +462,7 @@ static void codec_decode (demux_t *demux, void *data, block_t *block)
     if (data)
     {
         block->i_dts = 0; /* RTP does not specify this */
-        es_out_Control (demux->out, ES_OUT_SET_PCR,
-                        block->i_pts - demux->p_sys->caching * 1000);
+        es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts );
         es_out_Send (demux->out, (es_out_id_t *)data, block);
     }
     else
@@ -592,7 +609,7 @@ static void mpv_decode (demux_t *demux, void *data, block_t *block)
  */
 static void *ts_init (demux_t *demux)
 {
-    return stream_init (demux, "ts");
+    return stream_init (demux, *demux->psz_demux ? demux->psz_demux : "ts");
 }
 
 
@@ -674,7 +691,7 @@ static int Demux (demux_t *demux)
             msg_Dbg (demux, "detected MPEG Audio");
             pt.init = mpa_init;
             pt.decode = mpa_decode;
-            pt.frequency = 44100;
+            pt.frequency = 90000;
             break;
 
           case 32: