Skip to content

V
vlc
Commit e1f09197 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

RTP sout: fix buffer size for SRTP

parent bc3af7e7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
modules/stream_out/rtp.c
View file @ e1f09197
...@@ -945,6 +945,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -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)"); msg_Err (p_stream, "bad SRTP key/salt combination (%m)");
goto error; goto error;
} }
id->i_sequence = 0; /* FIXME: awful hack for libvlc_srtp */
} }
vlc_mutex_init( &id->lock_sink ); vlc_mutex_init( &id->lock_sink );
...@@ -1440,16 +1441,10 @@ static void ThreadSend( vlc_object_t *p_this ) ...@@ -1440,16 +1441,10 @@ static void ThreadSend( vlc_object_t *p_this )
if( id->srtp ) if( id->srtp )
{ /* FIXME: this is awfully inefficient */ { /* FIXME: this is awfully inefficient */
size_t len = out->i_buffer; size_t len = out->i_buffer;
int val = srtp_send( id->srtp, out->p_buffer, &len, out = block_Realloc( out, 0, len + 10 );
out->i_buffer ); out->i_buffer = len;
if( val == ENOSPC )
{ int val = srtp_send( id->srtp, out->p_buffer, &len, len + 10 );
out = block_Realloc( out, 0, len );
if( out == NULL )
continue;
val = srtp_send( id->srtp, out->p_buffer, &len,
out->i_buffer );
}
if( val ) if( val )
{ {
errno = val; errno = val;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment