[vlc-commits] input_clock: remove useless mutex
Thomas Guillem
git at videolan.org
Fri Jan 29 11:34:46 UTC 2021
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Dec 22 15:59:02 2020 +0100| [e0930c2b654f5b996a26088f3fc3bc25f518489b] | committer: Thomas Guillem
input_clock: remove useless mutex
It is now always accessed from es_out.c and protected with the es_out
mutex.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e0930c2b654f5b996a26088f3fc3bc25f518489b
---
src/clock/input_clock.c | 52 +------------------------------------------------
src/clock/input_clock.h | 2 +-
2 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/src/clock/input_clock.c b/src/clock/input_clock.c
index b5472b3385..f09e0bbb8f 100644
--- a/src/clock/input_clock.c
+++ b/src/clock/input_clock.c
@@ -104,9 +104,6 @@
/* */
struct input_clock_t
{
- /* */
- vlc_mutex_t lock;
-
/* Last point
* It is used to detect unexpected stream discontinuities */
clock_point_t last;
@@ -154,7 +151,6 @@ input_clock_t *input_clock_New( float rate )
if( !cl )
return NULL;
- vlc_mutex_init( &cl->lock );
cl->b_has_reference = false;
cl->ref = clock_point_Create( VLC_TICK_INVALID, VLC_TICK_INVALID );
cl->b_has_external_clock = false;
@@ -201,8 +197,6 @@ vlc_tick_t input_clock_Update( input_clock_t *cl, vlc_object_t *p_log,
assert( i_ck_stream != VLC_TICK_INVALID && i_ck_system != VLC_TICK_INVALID );
- vlc_mutex_lock( &cl->lock );
-
if( !cl->b_has_reference )
{
/* */
@@ -277,8 +271,6 @@ vlc_tick_t input_clock_Update( input_clock_t *cl, vlc_object_t *p_log,
cl->late.i_index = ( cl->late.i_index + 1 ) % INPUT_CLOCK_LATE_COUNT;
}
- vlc_mutex_unlock( &cl->lock );
-
return i_late;
}
@@ -287,13 +279,9 @@ vlc_tick_t input_clock_Update( input_clock_t *cl, vlc_object_t *p_log,
*****************************************************************************/
void input_clock_Reset( input_clock_t *cl )
{
- vlc_mutex_lock( &cl->lock );
-
cl->b_has_reference = false;
cl->ref = clock_point_Create( VLC_TICK_INVALID, VLC_TICK_INVALID );
cl->b_has_external_clock = false;
-
- vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
@@ -301,8 +289,6 @@ void input_clock_Reset( input_clock_t *cl )
*****************************************************************************/
void input_clock_ChangeRate( input_clock_t *cl, float rate )
{
- vlc_mutex_lock( &cl->lock );
-
if( cl->b_has_reference )
{
/* Move the reference point (as if we were playing at the new rate
@@ -310,8 +296,6 @@ void input_clock_ChangeRate( input_clock_t *cl, float rate )
cl->ref.system = cl->last.system - (vlc_tick_t) ((cl->last.system - cl->ref.system) / rate * cl->rate);
}
cl->rate = rate;
-
- vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
@@ -319,7 +303,6 @@ void input_clock_ChangeRate( input_clock_t *cl, float rate )
*****************************************************************************/
void input_clock_ChangePause( input_clock_t *cl, bool b_paused, vlc_tick_t i_date )
{
- vlc_mutex_lock( &cl->lock );
assert( (!cl->b_paused) != (!b_paused) );
if( cl->b_paused )
@@ -334,8 +317,6 @@ void input_clock_ChangePause( input_clock_t *cl, bool b_paused, vlc_tick_t i_dat
}
cl->i_pause_date = i_date;
cl->b_paused = b_paused;
-
- vlc_mutex_unlock( &cl->lock );
}
/*****************************************************************************
@@ -345,14 +326,10 @@ vlc_tick_t input_clock_GetWakeup( input_clock_t *cl )
{
vlc_tick_t i_wakeup = 0;
- vlc_mutex_lock( &cl->lock );
-
/* Synchronized, we can wait */
if( cl->b_has_reference )
i_wakeup = ClockStreamToSystem( cl, cl->last.stream + AvgGet( &cl->drift ) - cl->i_buffering_duration );
- vlc_mutex_unlock( &cl->lock );
-
return i_wakeup;
}
@@ -361,24 +338,15 @@ vlc_tick_t input_clock_GetWakeup( input_clock_t *cl )
*****************************************************************************/
float input_clock_GetRate( input_clock_t *cl )
{
- vlc_mutex_lock( &cl->lock );
- float rate = cl->rate;
- vlc_mutex_unlock( &cl->lock );
-
- return rate;
+ return cl->rate;
}
int input_clock_GetState( input_clock_t *cl,
vlc_tick_t *pi_stream_start, vlc_tick_t *pi_system_start,
vlc_tick_t *pi_stream_duration, vlc_tick_t *pi_system_duration )
{
- vlc_mutex_lock( &cl->lock );
-
if( !cl->b_has_reference )
- {
- vlc_mutex_unlock( &cl->lock );
return VLC_EGENERIC;
- }
*pi_stream_start = cl->ref.stream;
*pi_system_start = cl->ref.system;
@@ -386,15 +354,11 @@ int input_clock_GetState( input_clock_t *cl,
*pi_stream_duration = cl->last.stream - cl->ref.stream;
*pi_system_duration = cl->last.system - cl->ref.system;
- vlc_mutex_unlock( &cl->lock );
-
return VLC_SUCCESS;
}
void input_clock_ChangeSystemOrigin( input_clock_t *cl, bool b_absolute, vlc_tick_t i_system )
{
- vlc_mutex_lock( &cl->lock );
-
assert( cl->b_has_reference );
vlc_tick_t i_offset;
if( b_absolute )
@@ -413,29 +377,21 @@ void input_clock_ChangeSystemOrigin( input_clock_t *cl, bool b_absolute, vlc_tic
cl->ref.system += i_offset;
cl->last.system += i_offset;
-
- vlc_mutex_unlock( &cl->lock );
}
void input_clock_GetSystemOrigin( input_clock_t *cl, vlc_tick_t *pi_system, vlc_tick_t *pi_delay )
{
- vlc_mutex_lock( &cl->lock );
-
assert( cl->b_has_reference );
*pi_system = cl->ref.system;
if( pi_delay )
*pi_delay = cl->i_pts_delay;
-
- vlc_mutex_unlock( &cl->lock );
}
#warning "input_clock_SetJitter needs more work"
void input_clock_SetJitter( input_clock_t *cl,
vlc_tick_t i_pts_delay, int i_cr_average )
{
- vlc_mutex_lock( &cl->lock );
-
/* Update late observations */
const vlc_tick_t i_delay_delta = i_pts_delay - cl->i_pts_delay;
vlc_tick_t pi_late[INPUT_CLOCK_LATE_COUNT];
@@ -466,14 +422,10 @@ void input_clock_SetJitter( input_clock_t *cl,
if( cl->drift.range != i_cr_average )
AvgRescale( &cl->drift, i_cr_average );
-
- vlc_mutex_unlock( &cl->lock );
}
vlc_tick_t input_clock_GetJitter( input_clock_t *cl )
{
- vlc_mutex_lock( &cl->lock );
-
#if INPUT_CLOCK_LATE_COUNT != 3
# error "unsupported INPUT_CLOCK_LATE_COUNT"
#endif
@@ -487,8 +439,6 @@ vlc_tick_t input_clock_GetJitter( input_clock_t *cl )
vlc_tick_t i_late_median = p[0] + p[1] + p[2] - __MIN(__MIN(p[0],p[1]),p[2]) - __MAX(__MAX(p[0],p[1]),p[2]);
vlc_tick_t i_pts_delay = cl->i_pts_delay ;
- vlc_mutex_unlock( &cl->lock );
-
return i_pts_delay + i_late_median;
}
diff --git a/src/clock/input_clock.h b/src/clock/input_clock.h
index a1bb2a78cf..f9a74f0809 100644
--- a/src/clock/input_clock.h
+++ b/src/clock/input_clock.h
@@ -30,7 +30,7 @@
/** @struct input_clock_t
* This structure is used to manage clock drift and reception jitters
*
- * All functions MUST be called from one and only one thread.
+ * This API is reentrant but not thread-safe.
*/
typedef struct input_clock_t input_clock_t;
More information about the vlc-commits
mailing list