videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-07-21 07:24:15 +02:00
Code Releases Activity

auhal: rename i_dev_latency_us to i_dev_latency_ticks

Browse Source 
The type is actually vlc_tick_t, so in order to prevent
confusion, it should be named accordingly.
This commit is contained in:
Marvin Scholz 2021-04-26 19:00:37 +02:00 committed by Jean-Baptiste Kempf
parent 90d73cd561
commit 6ad7ac4c4b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/audio_output/coreaudio_common.c
View File

@ -250,7 +250,7 @@ ca_GetLatencyLocked(audio_output_t *p_aout)
const int64_t i_out_frames = BytesToFrames(p_sys, p_sys->i_out_size);
return FramesToTicks(p_sys, i_out_frames + p_sys->i_render_frames)
+ p_sys->i_dev_latency_us;
+ p_sys->i_dev_latency_ticks;
}
int
@ -408,7 +408,7 @@ ca_Play(audio_output_t * p_aout, block_t * p_block, vlc_tick_t date)
int
ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt,
vlc_tick_t i_dev_latency_us)
vlc_tick_t i_dev_latency_ticks)
{
struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
@ -422,7 +422,7 @@ ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt,
p_sys->i_frame_length = fmt->i_frame_length;
p_sys->chans_to_reorder = 0;
p_sys->i_dev_latency_us = i_dev_latency_us;
p_sys->i_dev_latency_ticks = i_dev_latency_ticks;
/* setup circular buffer */
size_t i_audiobuffer_size = fmt->i_rate * fmt->i_bytes_per_frame
@ -476,12 +476,12 @@ ca_SetAliveState(audio_output_t *p_aout, bool alive)
vlc_sem_post(&p_sys->flush_sem);
}
void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us)
void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_ticks)
{
struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
lock_lock(p_sys);
p_sys->i_dev_latency_us = i_dev_latency_us;
p_sys->i_dev_latency_ticks = i_dev_latency_ticks;
lock_unlock(p_sys);
}
@ -857,7 +857,7 @@ SetupInputLayout(audio_output_t *p_aout, const audio_sample_format_t *fmt,
int
au_Initialize(audio_output_t *p_aout, AudioUnit au, audio_sample_format_t *fmt,
const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us,
const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_ticks,
bool *warn_configuration)
{
int ret;
@ -965,7 +965,7 @@ au_Initialize(audio_output_t *p_aout, AudioUnit au, audio_sample_format_t *fmt,
return VLC_EGENERIC;
}
ret = ca_Initialize(p_aout, fmt, i_dev_latency_us);
ret = ca_Initialize(p_aout, fmt, i_dev_latency_ticks);
if (ret != VLC_SUCCESS)
{
AudioUnitUninitialize(au);

10
modules/audio_output/coreaudio_common.h
View File

@ -80,8 +80,8 @@ struct aout_sys_common
unsigned int i_frame_length;
uint8_t chans_to_reorder;
uint8_t chan_table[AOUT_CHAN_MAX];
/* ca_TimeGet extra latency, in micro-seconds */
vlc_tick_t i_dev_latency_us;
/* ca_TimeGet extra latency, in vlc ticks */
vlc_tick_t i_dev_latency_ticks;
};
int ca_Open(audio_output_t *p_aout);
@ -98,19 +98,19 @@ void ca_Pause(audio_output_t * p_aout, bool pause, vlc_tick_t date);
void ca_Play(audio_output_t * p_aout, block_t * p_block, vlc_tick_t date);
int ca_Initialize(audio_output_t *p_aout, const audio_sample_format_t *fmt,
vlc_tick_t i_dev_latency_us);
vlc_tick_t i_dev_latency_ticks);
void ca_Uninitialize(audio_output_t *p_aout);
void ca_SetAliveState(audio_output_t *p_aout, bool alive);
void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_us);
void ca_SetDeviceLatency(audio_output_t *p_aout, vlc_tick_t i_dev_latency_ticks);
AudioUnit au_NewOutputInstance(audio_output_t *p_aout, OSType comp_sub_type);
int au_Initialize(audio_output_t *p_aout, AudioUnit au,
audio_sample_format_t *fmt,
const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_us,
const AudioChannelLayout *outlayout, vlc_tick_t i_dev_latency_ticks,
bool *warn_configuration);
void au_Uninitialize(audio_output_t *p_aout, AudioUnit au);