From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Sun, 15 Jun 2008 19:41:04 +0000 (+0300)
Subject: RTP sout: fix buffer size for SRTP
X-Git-Tag: 0.9.0-test0~4
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e1f0919720c9ba214ce800146a3155e3924ce7d5;hp=bc3af7e7aadb33cb0940e50fa270a165192a06bc;p=vlc

RTP sout: fix buffer size for SRTP
---

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index c74f659530..d09419372e 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -945,6 +945,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
             msg_Err (p_stream, "bad SRTP key/salt combination (%m)");
             goto error;
         }
+        id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */
     }
 
     vlc_mutex_init( &id->lock_sink );
@@ -1440,16 +1441,10 @@ static void ThreadSend( vlc_object_t *p_this )
         if( id->srtp )
         {   /* FIXME: this is awfully inefficient */
             size_t len = out->i_buffer;
-            int val = srtp_send( id->srtp, out->p_buffer, &len,
-                                out->i_buffer );
-            if( val == ENOSPC )
-            {
-                out = block_Realloc( out, 0, len );
-                if( out == NULL )
-                    continue;
-                val = srtp_send( id->srtp, out->p_buffer, &len,
-                                 out->i_buffer );
-            }
+            out = block_Realloc( out, 0, len + 10 );
+            out->i_buffer = len;
+
+            int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 );
             if( val )
             {
                 errno = val;