Skip to content

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

SAP: no need to keep two dates per announce

parent 9522f374
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 27 deletions
src/stream_output/sap.c
View file @ 443a59d6
/***************************************************************************** /*****************************************************************************
* sap.c : SAP announce handler * sap.c : SAP announce handler
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2007 the VideoLAN team * Copyright (C) 2002-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Clément Stenac <zorglub@videolan.org> * Authors: Clément Stenac <zorglub@videolan.org>
...@@ -87,7 +87,6 @@ struct sap_session_t { ...@@ -87,7 +87,6 @@ struct sap_session_t {
session_descriptor_t *p_sd; session_descriptor_t *p_sd;
/* Last and next send */ /* Last and next send */
mtime_t i_last;
mtime_t i_next; mtime_t i_next;
}; };
...@@ -97,7 +96,7 @@ struct sap_session_t { ...@@ -97,7 +96,7 @@ struct sap_session_t {
static void * RunThread( vlc_object_t *p_this); static void * RunThread( vlc_object_t *p_this);
static int ComputeRate( sap_address_t *p_address ); static int ComputeRate( sap_address_t *p_address );
static int announce_SendSAPAnnounce( sap_handler_t *p_sap, static void announce_SendSAPAnnounce( sap_handler_t *p_sap,
sap_session_t *p_session ); sap_session_t *p_session );
...@@ -443,7 +442,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap, ...@@ -443,7 +442,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
/* If needed, build the SDP */ /* If needed, build the SDP */
assert( p_session->psz_sdp != NULL ); assert( p_session->psz_sdp != NULL );
p_sap_session->i_last = 0; p_sap_session->i_next = 0;
p_sap_session->i_length = headsize + strlen (p_session->psz_sdp); p_sap_session->i_length = headsize + strlen (p_session->psz_sdp);
p_sap_session->psz_data = malloc (p_sap_session->i_length + 1); p_sap_session->psz_data = malloc (p_sap_session->i_length + 1);
if (p_sap_session->psz_data == NULL) if (p_sap_session->psz_data == NULL)
...@@ -545,19 +544,14 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap, ...@@ -545,19 +544,14 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int announce_SendSAPAnnounce( sap_handler_t *p_sap, static void announce_SendSAPAnnounce( sap_handler_t *p_sap,
sap_session_t *p_session ) sap_session_t *p_session )
{ {
/* This announce has never been sent yet */ mtime_t now = mdate();
if( p_session->i_last == 0 )
{ if( p_session->i_next >= now )
p_session->i_next = mdate()+ p_session->p_address->i_interval*1000000; return;
p_session->i_last = 1;
return VLC_SUCCESS;
}
if( p_session->i_next < mdate() )
{
ssize_t i_ret = send( p_session->p_address->i_wfd, p_session->psz_data, ssize_t i_ret = send( p_session->p_address->i_wfd, p_session->psz_data,
p_session->i_length, 0 ); p_session->i_length, 0 );
if( i_ret != (ssize_t)p_session->i_length ) if( i_ret != (ssize_t)p_session->i_length )
...@@ -566,11 +560,7 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap, ...@@ -566,11 +560,7 @@ static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
p_session->p_address->psz_address, p_session->p_address->psz_address,
i_ret, p_session->i_length ); i_ret, p_session->i_length );
} }
p_session->i_last = p_session->i_next; p_session->i_next = now + p_session->p_address->i_interval*CLOCK_FREQ;
p_session->i_next = p_session->i_last
+ p_session->p_address->i_interval*1000000;
}
return VLC_SUCCESS;
} }
static int ComputeRate( sap_address_t *p_address ) static int ComputeRate( sap_address_t *p_address )
......
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