vlc | branch: master | Thomas Guillem <[email protected]> | Tue Feb 19 17:27:01 2019 +0100| [c620103157cfeb283cf761807a65e7a34ee6ddce] | committer: Thomas Guillem
aout: remove unused sync.end Unused since a308b7a17466bb91908a518c93b36dacb49212e7 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c620103157cfeb283cf761807a65e7a34ee6ddce --- src/audio_output/aout_internal.h | 1 - src/audio_output/dec.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index 204fce5615..32be61034f 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -62,7 +62,6 @@ typedef struct struct { - vlc_tick_t end; /**< Last seen PTS */ float rate; /**< Play-out speed rate */ vlc_tick_t resamp_start_drift; /**< Resampler drift absolute value */ int resamp_type; /**< Resampler mode (FIXME: redundant / resampling) */ diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 08666b7c61..0898487668 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -97,7 +97,6 @@ error: } owner->sync.rate = 1.f; - owner->sync.end = VLC_TICK_INVALID; owner->sync.resamp_type = AOUT_RESAMPLING_NONE; owner->sync.discontinuity = true; @@ -156,7 +155,6 @@ static int aout_CheckReady (audio_output_t *aout) } msg_Dbg (aout, "restarting filters..."); - owner->sync.end = VLC_TICK_INVALID; owner->sync.resamp_type = AOUT_RESAMPLING_NONE; if (owner->mixer_format.i_format) @@ -264,7 +262,6 @@ static void aout_DecSynchronize(audio_output_t *aout, vlc_tick_t dec_pts) aout->flush(aout, false); aout_StopResampling (aout); - owner->sync.end = VLC_TICK_INVALID; owner->sync.discontinuity = true; /* Now the output might be too early... Recheck. */ @@ -376,7 +373,6 @@ int aout_DecPlay(audio_output_t *aout, block_t *block) aout_DecSynchronize(aout, block->i_pts); /* Output */ - owner->sync.end = block->i_pts + block->i_length + 1; owner->sync.discontinuity = false; aout->play(aout, block, block->i_pts); atomic_fetch_add_explicit(&owner->buffers_played, 1, memory_order_relaxed); @@ -403,14 +399,6 @@ void aout_DecChangePause (audio_output_t *aout, bool paused, vlc_tick_t date) { aout_owner_t *owner = aout_owner (aout); - if (owner->sync.end != VLC_TICK_INVALID) - { - if (paused) - owner->sync.end -= date; - else - owner->sync.end += date; - } - if (owner->mixer_format.i_format) aout->pause(aout, paused, date); } @@ -426,7 +414,6 @@ void aout_DecFlush (audio_output_t *aout, bool wait) { aout_owner_t *owner = aout_owner (aout); - owner->sync.end = VLC_TICK_INVALID; if (owner->mixer_format.i_format) { if (wait) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
