videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

aout: remove timing_report event 

Not used by any modules, and not thread-safe.
This commit is contained in:
Thomas Guillem 2022-04-05 13:16:38 +02:00
parent b92f4f50b4
commit 02293b1df3
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/vlc_aout.h
View File

@ -125,7 +125,6 @@
*/
struct vlc_audio_output_events {
void (*timing_report)(audio_output_t *, vlc_tick_t system_now, vlc_tick_t pts);
void (*drained_report)(audio_output_t *);
void (*volume_report)(audio_output_t *, float);
void (*mute_report)(audio_output_t *, bool);

2
src/audio_output/aout_internal.h
View File

@ -152,8 +152,6 @@ void vlc_aout_stream_NotifyDrained(vlc_aout_stream *stream);
void vlc_aout_stream_NotifyGain(vlc_aout_stream *stream, float gain);
void vlc_aout_stream_RequestRestart(vlc_aout_stream *stream, unsigned);
void vlc_aout_stream_RequestRetiming(vlc_aout_stream *stream, vlc_tick_t system_ts,
vlc_tick_t audio_ts);
void aout_InputRequestRestart(audio_output_t *aout);

8
src/audio_output/dec.c
View File

@ -365,8 +365,8 @@ static void stream_Silence (vlc_aout_stream *stream, vlc_tick_t length, vlc_tick
aout->play(aout, block, system_pts);
}
void vlc_aout_stream_RequestRetiming(vlc_aout_stream *stream, vlc_tick_t system_ts,
vlc_tick_t audio_ts)
static void stream_RequestRetiming(vlc_aout_stream *stream, vlc_tick_t system_ts,
vlc_tick_t audio_ts)
{
aout_owner_t *owner = aout_stream_owner(stream);
audio_output_t *aout = aout_stream_aout(stream);
@ -500,7 +500,7 @@ static void stream_Synchronize(vlc_aout_stream *stream, vlc_tick_t system_now,
/* Chicken-egg situation for most aout modules that can't be started
* deferred (all except PulseAudio). These modules will start to play
* data immediately and ignore the given play_date (that take the clock
* jitter into account). We don't want to let vlc_aout_stream_RequestRetiming()
* jitter into account). We don't want to let stream_RequestRetiming()
* handle the first silence (from the "Early audio output" case) since
* this function will first update the clock without taking the jitter
* into account. Therefore, we manually insert silence that correspond
@ -518,7 +518,7 @@ static void stream_Synchronize(vlc_aout_stream *stream, vlc_tick_t system_now,
}
}
vlc_aout_stream_RequestRetiming(stream, system_now + delay, dec_pts);
stream_RequestRetiming(stream, system_now + delay, dec_pts);
}
/*****************************************************************************

9
src/audio_output/output.c
View File

@ -63,14 +63,6 @@ static int var_CopyDevice (vlc_object_t *src, const char *name,
return var_Set (dst, "audio-device", value);
}
static void aout_TimingNotify(audio_output_t *aout, vlc_tick_t system_ts,
vlc_tick_t audio_ts)
{
aout_owner_t *owner = aout_owner (aout);
assert(owner->main_stream);
vlc_aout_stream_RequestRetiming(owner->main_stream, system_ts, audio_ts);
}
static void aout_DrainedNotify(audio_output_t *aout)
{
aout_owner_t *owner = aout_owner (aout);
@ -176,7 +168,6 @@ static int aout_GainNotify (audio_output_t *aout, float gain)
}
static const struct vlc_audio_output_events aout_events = {
aout_TimingNotify,
aout_DrainedNotify,
aout_VolumeNotify,
aout_MuteNotify,