Skip to content

V
vlc-1.1
Commit 1c1ae9cb authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Laurent Aimar
Browse files
Options

netsync: rewrite 

Signed-off-by: default avatarLaurent Aimar <fenrir@videolan.org>
parent 709d0455
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 78 deletions
modules/control/netsync.c
View file @ 1c1ae9cb
/***************************************************************************** /*****************************************************************************
* netsync.c: synchronisation between several network clients. * netsync.c: synchronisation between several network clients.
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 the VideoLAN team * Copyright (C) 2004-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* Jean-Paul Saman <jpsaman@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_es_out.h> #include <vlc_playlist.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
...@@ -46,26 +47,24 @@ ...@@ -46,26 +47,24 @@
#define NETSYNC_PORT 9875 #define NETSYNC_PORT 9875
/* FIXME: UGLY UGLY !! Netsync should be totally reworked */
#include "../../src/input/input_internal.h"
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
static int Activate( vlc_object_t * ); static int Activate( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close ( vlc_object_t * );
static mtime_t GetClockRef( intf_thread_t *, mtime_t ); #define NETSYNC_TEXT N_( "Network master clock" )
#define NETSYNC_LONGTEXT N_( "When set then " \
"this vlc instance shall dictate its clock for synchronisation" \
"over clients listening on the masters network ip address" )
/// \bug [String] This string is BAD. #define MIP_TEXT N_( "Master server ip address" )
#define NETSYNC_TEXT N_( "Act as master" ) #define MIP_LONGTEXT N_( "The IP address of " \
#define NETSYNC_LONGTEXT N_( "Should " \ "the network master clock to use for clock synchronisation." )
"act as the master client for the network synchronisation?" )
/// \bug [String] This string is BAD. #define NETSYNC_TIMEOUT_TEXT N_( "UDP timeout (in ms)" )
#define MIP_TEXT N_( "Master client ip address" ) #define NETSYNC_TIMEOUT_LONGTEXT N_("Amount of time (in ms) " \
#define MIP_LONGTEXT N_( "IP address of " \ "to wait before aborting network reception of data." )
"the master client used for the network synchronisation." )
vlc_module_begin () vlc_module_begin ()
set_shortname( N_("Network Sync")) set_shortname( N_("Network Sync"))
...@@ -77,6 +76,8 @@ vlc_module_begin () ...@@ -77,6 +76,8 @@ vlc_module_begin ()
NETSYNC_TEXT, NETSYNC_LONGTEXT, true ) NETSYNC_TEXT, NETSYNC_LONGTEXT, true )
add_string( "netsync-master-ip", NULL, NULL, MIP_TEXT, MIP_LONGTEXT, add_string( "netsync-master-ip", NULL, NULL, MIP_TEXT, MIP_LONGTEXT,
true ) true )
add_integer( "netsync-timeout", 500, NULL,
NETSYNC_TIMEOUT_TEXT, NETSYNC_TIMEOUT_LONGTEXT, true )
set_capability( "interface", 0 ) set_capability( "interface", 0 )
set_callbacks( Activate, Close ) set_callbacks( Activate, Close )
...@@ -95,7 +96,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -95,7 +96,7 @@ static int Activate( vlc_object_t *p_this )
intf_thread_t *p_intf = (intf_thread_t*)p_this; intf_thread_t *p_intf = (intf_thread_t*)p_this;
int fd; int fd;
if( !var_InheritInteger( p_intf, "netsync-master" ) ) if( !var_InheritBool( p_intf, "netsync-master" ) )
{ {
char *psz_master = var_InheritString( p_intf, "netsync-master-ip" ); char *psz_master = var_InheritString( p_intf, "netsync-master-ip" );
if( psz_master == NULL ) if( psz_master == NULL )
...@@ -136,11 +137,15 @@ void Close( vlc_object_t *p_this ) ...@@ -136,11 +137,15 @@ void Close( vlc_object_t *p_this )
static void Run( intf_thread_t *p_intf ) static void Run( intf_thread_t *p_intf )
{ {
#define MAX_MSG_LENGTH (2 * sizeof(int64_t)) #define MAX_MSG_LENGTH (2 * sizeof(int64_t))
int canc = vlc_savecancel();
input_thread_t *p_input = NULL; input_thread_t *p_input = NULL;
char p_data[MAX_MSG_LENGTH]; char p_data[MAX_MSG_LENGTH];
int i_socket; int i_socket;
int canc = vlc_savecancel();
playlist_t *p_playlist = pl_Hold( p_intf );
int i_timeout = __MIN( 500, var_InheritInteger( p_intf, "netsync-timeout" ) );
bool b_master = var_InheritBool( p_intf, "netsync-master" );
i_socket = (intptr_t)p_intf->p_sys;
/* High priority thread */ /* High priority thread */
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_INPUT ); vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_INPUT );
...@@ -149,10 +154,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -149,10 +154,10 @@ static void Run( intf_thread_t *p_intf )
{ {
/* Update the input */ /* Update the input */
if( p_input == NULL ) if( p_input == NULL )
p_input = {
(input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, p_input = playlist_CurrentInput( p_playlist );
FIND_ANYWHERE ); }
else if( p_input->b_dead ) else if( p_input->b_dead || !vlc_object_alive( p_input ) )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
p_input = NULL; p_input = NULL;
...@@ -176,18 +181,14 @@ static void Run( intf_thread_t *p_intf ) ...@@ -176,18 +181,14 @@ static void Run( intf_thread_t *p_intf )
if( b_master ) if( b_master )
{ {
struct sockaddr_storage from; struct sockaddr_storage from;
mtime_t i_date, i_clockref, i_master_clockref; mtime_t i_master_system;
mtime_t i_client_system;
mtime_t i_date;
int i_struct_size, i_read, i_ret; int i_struct_size, i_read, i_ret;
/* Don't block */ /* Don't block */
i_ret = poll( &ufd, 1, 500 ); i_ret = poll( &ufd, 1, i_timeout );
if( i_ret == 0 ) continue; if( i_ret <= 0 ) continue;
if( i_ret < 0 )
{
/* Wait a bit */
msleep( INTF_IDLE_SLEEP );
continue;
}
/* We received something */ /* We received something */
i_struct_size = sizeof( from ); i_struct_size = sizeof( from );
...@@ -195,13 +196,17 @@ static void Run( intf_thread_t *p_intf ) ...@@ -195,13 +196,17 @@ static void Run( intf_thread_t *p_intf )
(struct sockaddr*)&from, (struct sockaddr*)&from,
(unsigned int *)&i_struct_size ); (unsigned int *)&i_struct_size );
i_clockref = ntoh64(*(int64_t *)p_data); /* not sure we need the client information to sync,
since we are the master anyway */
i_client_system = ntoh64(*(int64_t *)p_data);
i_date = mdate(); i_date = mdate();
*(int64_t *)p_data = hton64( i_date );
i_master_clockref = GetClockRef( p_intf, i_clockref ); if( input_GetPcrSystem( p_input, &i_master_system ) )
*(((int64_t *)p_data)+1) = hton64( i_master_clockref ); continue;
*((int64_t *)p_data) = hton64( i_date );
*(((int64_t *)p_data)+1) = hton64( i_master_system );
/* Reply to the sender */ /* Reply to the sender */
sendto( i_socket, p_data, 2 * sizeof(int64_t), 0, sendto( i_socket, p_data, 2 * sizeof(int64_t), 0,
...@@ -209,96 +214,88 @@ static void Run( intf_thread_t *p_intf ) ...@@ -209,96 +214,88 @@ static void Run( intf_thread_t *p_intf )
#if 0 #if 0
msg_Dbg( p_intf, "Master clockref: %"PRId64" -> %"PRId64", from %s " msg_Dbg( p_intf, "Master clockref: %"PRId64" -> %"PRId64", from %s "
"(date: %"PRId64")", i_clockref, i_master_clockref, "(date: %"PRId64")", i_client_system, i_master_system,
from.ss_family == AF_INET (from.ss_family == AF_INET) ? inet_ntoa(((struct sockaddr_in *)&from)->sin_addr)
? inet_ntoa(((struct sockaddr_in *)&from)->sin_addr)
: "non-IPv4", i_date ); : "non-IPv4", i_date );
#endif #endif
} }
else else
{ {
mtime_t i_send_date, i_receive_date, i_master_date, i_diff_date; mtime_t i_master_system;
mtime_t i_master_clockref, i_client_clockref, i_drift; mtime_t i_client_system;
mtime_t i_clockref = 0; mtime_t i_system = 0;
mtime_t i_send_date, i_receive_date;
mtime_t i_diff_date, i_master_date;
int i_sent, i_read, i_ret; int i_sent, i_read, i_ret;
if( input_GetPcrSystem( p_input, &i_system ) )
{
msleep( INTF_IDLE_SLEEP );
continue;
}
/* Send clock request to the master */ /* Send clock request to the master */
*(int64_t *)p_data = hton64( i_clockref );
i_send_date = mdate(); i_send_date = mdate();
*((int64_t *)p_data) = hton64( i_system );
i_sent = send( i_socket, p_data, sizeof(int64_t), 0 ); i_sent = send( i_socket, p_data, sizeof(int64_t), 0 );
if( i_sent <= 0 ) if( i_sent <= 0 )
{ {
/* Wait a bit */
msleep( INTF_IDLE_SLEEP ); msleep( INTF_IDLE_SLEEP );
continue; continue;
} }
/* Don't block */ /* Don't block */
i_ret = poll( &ufd, 1, 500 ); i_ret = poll( &ufd, 1, i_timeout );
if( i_ret == 0 ) continue; if( i_ret == 0 ) continue;
if( i_ret < 0 ) if( i_ret < 0 )
{ {
/* Wait a bit */
msleep( INTF_IDLE_SLEEP ); msleep( INTF_IDLE_SLEEP );
continue; continue;
} }
i_receive_date = mdate(); i_receive_date = mdate();
i_read = recv( i_socket, p_data, MAX_MSG_LENGTH, 0 ); i_read = recv( i_socket, p_data, MAX_MSG_LENGTH, 0 );
if( i_read <= 0 ) if( i_read <= 0 )
{ {
/* Wait a bit */
msleep( INTF_IDLE_SLEEP ); msleep( INTF_IDLE_SLEEP );
continue; continue;
} }
i_master_date = ntoh64(*(int64_t *)p_data); i_master_date = ntoh64(*(int64_t *)p_data);
i_master_clockref = ntoh64(*(((int64_t *)p_data)+1)); i_master_system = ntoh64(*(((int64_t *)p_data)+1)); /* system date */
i_diff_date = i_receive_date - i_diff_date = i_receive_date -
((i_receive_date - i_send_date) / 2 + i_master_date); ((i_receive_date - i_send_date) / 2 + i_master_date);
i_client_clockref = i_drift = 0; if( p_input && i_master_system > 0 )
if( p_input && i_master_clockref )
{ {
i_client_clockref = GetClockRef( p_intf, i_clockref ); mtime_t i_diff_system;
i_drift = i_client_clockref - i_master_clockref - i_diff_date;
if( input_GetPcrSystem( p_input, &i_client_system ) )
/* Update our clock to match the master's one */ {
if( i_client_clockref ) msleep( INTF_IDLE_SLEEP );
p_input->i_pts_delay -= i_drift; continue;
} }
i_diff_system = i_client_system - i_master_system - i_diff_date;
if( i_diff_system != 0 )
{
input_ModifyPcrSystem( p_input, true, i_master_system - i_diff_date );
#if 0 #if 0
msg_Dbg( p_intf, "Slave clockref: %"PRId64" -> %"PRId64" -> %"PRId64", " msg_Dbg( p_intf, "Slave clockref: %"PRId64" -> %"PRId64" -> %"PRId64","
"clock diff: %"PRId64" drift: %"PRId64, " clock diff: %"PRId64", diff: %"PRId64"",
i_clockref, i_master_clockref, i_system, i_master_system, i_client_system,
i_client_clockref, i_diff_date, i_drift ); i_diff_system, i_diff_date );
#endif #endif
}
/* Wait a bit */ }
msleep( INTF_IDLE_SLEEP ); msleep( INTF_IDLE_SLEEP );
} }
} }
if( p_input ) vlc_object_release( p_input ); if( p_input ) vlc_object_release( p_input );
pl_Release( p_intf );
vlc_restorecancel( canc ); vlc_restorecancel( canc );
} }
static mtime_t GetClockRef( intf_thread_t *p_intf, mtime_t i_pts )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
mtime_t i_ts;
if( !p_input || !p_input->p->p_es_out ) return 0;
if( es_out_Control( p_input->p->p_es_out, ES_OUT_GET_TS, i_pts, &i_ts ) ==
VLC_SUCCESS )
{
return i_ts;
}
return 0;
}
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