Skip to content

V
vlc-1.1
Commit 5fed3935 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Cosmetics.

parent 30c3ea22
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 34 deletions
src/input/clock.c
View file @ 5fed3935
...@@ -115,40 +115,9 @@ struct input_clock_t ...@@ -115,40 +115,9 @@ struct input_clock_t
int i_cr_average; int i_cr_average;
}; };
/***************************************************************************** static mtime_t ClockStreamToSystem( input_clock_t *, mtime_t i_clock );
* ClockStreamToSystem: converts a movie clock to system date static mtime_t ClockSystemToStream( input_clock_t *, mtime_t i_system );
*****************************************************************************/ static void ClockSetReference( input_clock_t *, mtime_t i_clock, mtime_t i_system );
static mtime_t ClockStreamToSystem( input_clock_t *cl, mtime_t i_clock )
{
if( !cl->b_has_reference )
return 0;
return ( i_clock - cl->ref.i_clock ) * cl->i_rate / INPUT_RATE_DEFAULT +
cl->ref.i_system;
}
/*****************************************************************************
* ClockSystemToStream: converts a system date to movie clock
*****************************************************************************
* Caution : a valid reference point is needed for this to operate.
*****************************************************************************/
static mtime_t ClockSystemToStream( input_clock_t *cl, mtime_t i_system )
{
assert( cl->b_has_reference );
return ( i_system - cl->ref.i_system ) * INPUT_RATE_DEFAULT / cl->i_rate +
cl->ref.i_clock;
}
/*****************************************************************************
* ClockSetReference: writes a new clock reference
*****************************************************************************/
static void ClockSetReference( input_clock_t *cl,
mtime_t i_clock, mtime_t i_system )
{
cl->b_has_reference = true;
cl->ref.i_clock = i_clock;
cl->ref.i_system = i_system;
}
/***************************************************************************** /*****************************************************************************
* input_clock_New: create a new clock * input_clock_New: create a new clock
...@@ -316,3 +285,39 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl ) ...@@ -316,3 +285,39 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl )
return ClockStreamToSystem( cl, cl->last.i_clock ); return ClockStreamToSystem( cl, cl->last.i_clock );
} }
/*****************************************************************************
* ClockStreamToSystem: converts a movie clock to system date
*****************************************************************************/
static mtime_t ClockStreamToSystem( input_clock_t *cl, mtime_t i_clock )
{
if( !cl->b_has_reference )
return 0;
return ( i_clock - cl->ref.i_clock ) * cl->i_rate / INPUT_RATE_DEFAULT +
cl->ref.i_system;
}
/*****************************************************************************
* ClockSystemToStream: converts a system date to movie clock
*****************************************************************************
* Caution : a valid reference point is needed for this to operate.
*****************************************************************************/
static mtime_t ClockSystemToStream( input_clock_t *cl, mtime_t i_system )
{
assert( cl->b_has_reference );
return ( i_system - cl->ref.i_system ) * INPUT_RATE_DEFAULT / cl->i_rate +
cl->ref.i_clock;
}
/*****************************************************************************
* ClockSetReference: writes a new clock reference
*****************************************************************************/
static void ClockSetReference( input_clock_t *cl,
mtime_t i_clock, mtime_t i_system )
{
cl->b_has_reference = true;
cl->ref.i_clock = i_clock;
cl->ref.i_system = i_system;
}
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