ALSA: pcm: reinvent the stream synchronization ID API
Jaroslav Kysela
maintainerv3 cover ALSA: pcm: reinvent the stream synchronization ID API
Until the commit e11f0f90a626 ("ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command"), there was a possibility to pass information about the synchronized streams to the user space. The mentioned commit removed blindly the appropriate code with an irrelevant comment.
The revert may be appropriate, but since this API was lost for several years without any complains, it's time to improve it. The hardware parameters may change the used stream clock source (e.g. USB hardware) so move this synchronization ID to hw_params as read-only field.
It seems that pipewire can benefit from this API (disable adaptive resampling for perfectly synchronized PCM streams) now.
v2->v3:
- fix pcm_sync_empty() function (wrong comparison) [thanks Takashi Sakamoto]
- more documentation for snd_pcm_set_sync_per_card (ID composition)
v1->v2:
- remove union usage per Takashi's request
- reduce memory usage
- use standard ID generation scheme
Jaroslav Kysela (2):
ALSA: pcm: reinvent the stream synchronization ID API
ALSA: pcm: optimize and clarify stream sychronization ID API
include/sound/pcm.h | 19 ++++++++++++-- include/uapi/sound/asound.h | 13 +++------- sound/core/pcm_lib.c | 50 +++++++++++++++++++++++++++++-------- sound/core/pcm_native.c | 6 +++++ sound/pci/emu10k1/p16v.c | 17 +++++++++---- 5 files changed, 79 insertions(+), 26 deletions(-)
Signature · 1 line
2.43.0
Jaroslav Kysela
maintainerPATCH v3 1/2 ALSA: pcm: reinvent the stream synchronization ID API
Until the commit e11f0f90a626 ("ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command"), there was a possibility to pass information about the synchronized streams to the user space. The mentioned commit removed blindly the appropriate code with an irrelevant comment.
The revert may be appropriate, but since this API was lost for several years without any complains, it's time to improve it. The hardware parameters may change the used stream clock source (e.g. USB hardware) so move this synchronization ID to hw_params as read-only field.
It seems that pipewire can benefit from this API (disable adaptive resampling for perfectly synchronized PCM streams) now.
--- include/sound/pcm.h | 12 +++++++++++- include/uapi/sound/asound.h | 13 ++++--------- sound/core/pcm_lib.c | 18 ++++++++++++++---- sound/core/pcm_native.c | 6 ++++++ sound/pci/emu10k1/p16v.c | 7 +++---- 5 files changed, 38 insertions(+), 18 deletions(-)
include/sound/pcm.h +11 -1
@@ -11,6 +11,7 @@#include <sound/asound.h> #include <sound/memalloc.h> #include <sound/minors.h> +#include <asm/unaligned.h> #include <linux/poll.h> #include <linux/mm.h> #include <linux/bitops.h>
@@ -93,6 +94,7 @@ struct snd_pcm_ops {#define SNDRV_PCM_IOCTL1_CHANNEL_INFO 2/* 3 is absent slot. */ #define SNDRV_PCM_IOCTL1_FIFO_SIZE 4 +#define SNDRV_PCM_IOCTL1_SYNC_ID 5#define SNDRV_PCM_TRIGGER_STOP 0#define SNDRV_PCM_TRIGGER_START 1
@@ -396,7 +398,7 @@ struct snd_pcm_runtime {snd_pcm_uframes_t silence_start;/* starting pointer to silence area */ snd_pcm_uframes_t silence_filled;/* already filled part of silence area */ -union snd_pcm_sync_id sync;/* hardware synchronization ID */ +unsigned char sync[16 ];/* hardware synchronization ID */ /* -- mmap -- */ struct snd_pcm_mmap_status *status;
@@ -1565,6 +1567,14 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) (__force int)(f) <= (__force int)SNDRV_PCM_FORMAT_LAST; \ (f) = (__force snd_pcm_format_t)((__force int)(f) + 1)) +/** +* is sync id (clock id) empty? +*/ +static inline bool pcm_sync_empty (const unsigned char *sync) +{ +return get_unaligned ((__u64 *)(sync +0 )) ==0 &&get_unaligned ((__u64 *)(sync +8 )) ==0 ; +} +/* printk helpers */ #define pcm_err(pcm, fmt, args...) \ dev_err((pcm)->card->dev, fmt, ##args)
include/uapi/sound/asound.h +4 -9
@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image {* * *****************************************************************************/ -#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 17) +#define SNDRV_PCM_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 18)typedef unsigned long snd_pcm_uframes_t ;typedef signed long snd_pcm_sframes_t ;
@@ -330,12 +330,6 @@ enum {#endif }; -union snd_pcm_sync_id { -unsigned char id[16 ]; -unsigned short id16[8 ]; -unsigned int id32[4 ]; -}; -struct snd_pcm_info {unsigned int device;/* RO/WR (control): device number */ unsigned int subdevice;/* RO/WR (control): subdevice number */
@@ -348,7 +342,7 @@ struct snd_pcm_info {int dev_subclass;/* SNDRV_PCM_SUBCLASS_* */ unsigned int subdevices_count;unsigned int subdevices_avail; -union snd_pcm_sync_id sync;/* hardware synchronization ID */ +unsigned char pad1[16 ];/* was: hardware synchronization ID */ unsigned char reserved[64 ];/* reserved for future... */ };
@@ -420,7 +414,8 @@ struct snd_pcm_hw_params {unsigned int rate_num;/* R: rate numerator */ unsigned int rate_den;/* R: rate denominator */ snd_pcm_uframes_t fifo_size;/* R: chip FIFO size in frames */ -unsigned char reserved[64 ];/* reserved for future */ +unsigned char sync[16 ];/* R: synchronization ID (perfect sync - one clock source) */ +unsigned char reserved[48 ];/* reserved for future */ };enum {
sound/core/pcm_lib.c +14 -4
@@ -525,10 +525,8 @@ void snd_pcm_set_sync(struct snd_pcm_substream *substream) {struct snd_pcm_runtime *runtime = substream->runtime; - runtime->sync.id32[0 ] = substream->pcm->card->number; - runtime->sync.id32[1 ] =-1 ; - runtime->sync.id32[2 ] =-1 ; - runtime->sync.id32[3 ] =-1 ; + *(__u32 *)runtime->sync =cpu_to_le32 (substream->pcm->card->number); +memset (runtime->sync +4 ,0xff ,sizeof (runtime->sync) -4 ); }EXPORT_SYMBOL (snd_pcm_set_sync);
@@ -1810,6 +1808,16 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,return 0 ; } +static int snd_pcm_lib_ioctl_sync_id (struct snd_pcm_substream *substream, +void *arg) +{ +struct snd_pcm_hw_params *params = arg; + +if (pcm_sync_empty (params->sync)) +memcpy (params->sync, &substream->runtime->sync,sizeof (params->sync)); +return 0 ; +} +/** * snd_pcm_lib_ioctl - a generic PCM ioctl callback * @substream: the pcm substream instance
@@ -1831,6 +1839,8 @@ int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,return snd_pcm_lib_ioctl_channel_info (substream, arg);case SNDRV_PCM_IOCTL1_FIFO_SIZE :return snd_pcm_lib_ioctl_fifo_size (substream, arg); +case SNDRV_PCM_IOCTL1_SYNC_ID : +return snd_pcm_lib_ioctl_sync_id (substream, arg); }return -ENXIO ; }
sound/core/pcm_native.c +6 -0
@@ -533,6 +533,12 @@ static int fixup_unreferenced_params(struct snd_pcm_substream *substream, SNDRV_PCM_INFO_MMAP_VALID); } + err =snd_pcm_ops_ioctl (substream, +SNDRV_PCM_IOCTL1_SYNC_ID , + params); +if (err <0 ) +return err; +return 0 ; }
sound/pci/emu10k1/p16v.c +3 -4
@@ -174,10 +174,9 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substreaif (err <0 )return err; - runtime->sync.id32[0 ] = substream->pcm->card->number; - runtime->sync.id32[1 ] ='P' ; - runtime->sync.id32[2 ] =16 ; - runtime->sync.id32[3 ] ='V' ; + *(__u32 *)runtime->sync =cpu_to_le32 (substream->pcm->card->number); +memset (runtime->sync +4 ,0 ,sizeof (runtime->sync) -4 ); +strncpy (runtime->sync +4 ,"P16V" ,4 );return 0 ; }
Signature · 1 line
2.43.0
include/sound/pcm.h static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) · line 1576
Quoted 7 lines · Jaroslav Kysela
include/sound/pcm.h +7
-0+/** +* is sync id (clock id) empty? +*/ +static inline bool pcm_sync_empty (const unsigned char *sync) +{ +return get_unaligned ((__u64 *)(sync +0 )) ==0 &&get_unaligned ((__u64 *)(sync +8 )) ==0 ; +}
This helper is needed only in one place, so we don't have to put in the common header. Let's move to a local place (together with unaligned.h inclusion).
sound/core/pcm_lib.c static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, · line 1817
Quoted 11 lines
sound/core/pcm_lib.c +7
-0@@ -1810,6 +1808,16 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,return 0 ; } +static int snd_pcm_lib_ioctl_sync_id (struct snd_pcm_substream *substream, +void *arg) +{ +struct snd_pcm_hw_params *params = arg; + +if (pcm_sync_empty (params->sync)) +memcpy (params->sync, &substream->runtime->sync,sizeof (params->sync));
Since sync is an array now, shouldn't we drop '&' here?
thanks,
Takashi
Jaroslav Kysela
maintainerPATCH v3 2/2 ALSA: pcm: optimize and clarify stream sychronization ID API
In reply to Jaroslav KyselaOptimize the memory usage in struct snd_pcm_runtime - use boolean value for the standard sync ID scheme.
Introduce snd_pcm_set_sync_per_card function to build synchronization IDs.
--- include/sound/pcm.h | 9 +++++++-- sound/core/pcm_lib.c | 42 +++++++++++++++++++++++++++++----------- sound/pci/emu10k1/p16v.c | 16 +++++++++++---- 3 files changed, 50 insertions(+), 17 deletions(-)
include/sound/pcm.h +7 -2
@@ -398,7 +398,7 @@ struct snd_pcm_runtime {snd_pcm_uframes_t silence_start;/* starting pointer to silence area */ snd_pcm_uframes_t silence_filled;/* already filled part of silence area */ -unsigned char sync[16 ];/* hardware synchronization ID */ +bool sync_flag;/* hardware synchronization - standard per card ID */ /* -- mmap -- */ struct snd_pcm_mmap_status *status;
@@ -1152,7 +1152,12 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned intvoid snd_pcm_set_ops (struct snd_pcm * pcm,int direction,const struct snd_pcm_ops *ops); -void snd_pcm_set_sync (struct snd_pcm_substream *substream); +void snd_pcm_set_sync_per_card (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params, +const unsigned char *id,unsigned int len); +static inline void snd_pcm_set_sync (struct snd_pcm_substream *substream) +{ + substream->runtime->sync_flag = true; +}int snd_pcm_lib_ioctl (struct snd_pcm_substream *substream,unsigned int cmd,void *arg);void snd_pcm_period_elapsed_under_stream_lock (struct snd_pcm_substream *substream);
sound/core/pcm_lib.c +31 -11
60 lines not on this page · raw message
sound/pci/emu10k1/p16v.c +12 -4
@@ -174,10 +174,6 @@ static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substreaif (err <0 )return err; - *(__u32 *)runtime->sync =cpu_to_le32 (substream->pcm->card->number); -memset (runtime->sync +4 ,0 ,sizeof (runtime->sync) -4 ); -strncpy (runtime->sync +4 ,"P16V" ,4 ); -return 0 ; }
@@ -225,6 +221,17 @@ static int snd_p16v_pcm_open_capture(struct snd_pcm_substream *substream)return snd_p16v_pcm_open_capture_channel (substream,0 ); } +static int snd_p16v_pcm_ioctl_playback (struct snd_pcm_substream *substream, +unsigned int cmd,void *arg) +{ +if (cmd ==SNDRV_PCM_IOCTL1_SYNC_ID ) { +static const unsigned char id[4 ] = {'P' ,'1' ,'6' ,'V' }; +snd_pcm_set_sync_per_card (substream, arg, id,4 ); +return 0 ; + } +return snd_pcm_lib_ioctl (substream, cmd, arg); +} +/* prepare playback callback */ static int snd_p16v_pcm_prepare_playback (struct snd_pcm_substream *substream) {
@@ -530,6 +537,7 @@ snd_p16v_pcm_pointer_capture(struct snd_pcm_substream *substream)static const struct snd_pcm_ops snd_p16v_playback_front_ops = { .open = snd_p16v_pcm_open_playback_front, .close = snd_p16v_pcm_close_playback, + .ioctl = snd_p16v_pcm_ioctl_playback, .prepare = snd_p16v_pcm_prepare_playback, .trigger = snd_p16v_pcm_trigger_playback, .pointer = snd_p16v_pcm_pointer_playback,
Signature · 1 line
2.43.0
Re: [PATCH v3 2/2] ALSA: pcm: optimize and clarify stream sychronization ID API
include/sound/pcm.h int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int · line 1160
Quoted 5 lines · Jaroslav Kysela
include/sound/pcm.h +4
-0+static inline void snd_pcm_set_sync (struct snd_pcm_substream *substream) +{ + substream->runtime->sync_flag = true; +}
This function deserves for a proper comment. The kerndoc comment is lost by this patch.
sound/core/pcm_lib.c static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, · line 1834
Quoted 8 lines
sound/core/pcm_lib.c +3
-1@@ -1811,10 +1829,12 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,static int snd_pcm_lib_ioctl_sync_id (struct snd_pcm_substream *substream,void *arg) { -struct snd_pcm_hw_params *params = arg; +static unsigned char id[12 ] = {0xff ,0xff ,0xff ,0xff , +0xff ,0xff ,0xff ,0xff , +0xff ,0xff ,0xff ,0xff };
This can be const.
thanks,
Takashi
Quoted 6 lines · Jaroslav Kysela
Until the commit
e11f0f90a626("ALSA: pcm: removeSNDRV_PCM_IOCTL1_INFOinternal command"), there was a possibility to pass information about the synchronized streams to the user space. The mentioned commit removed blindly the appropriate code with an irrelevant comment.
Quoted 7 lines
The revert may be appropriate, but since this API was lost for several years without any complains, it's time to improve it. The hardware parameters may change the used stream clock source (e.g. USB hardware) so move this synchronization ID to
hw_paramsas read-only field.It seems that pipewire can benefit from this API (disable adaptive resampling for perfectly synchronized PCM streams) now.
I find the idea is fine. But as Sakamoto-san suggested in the previous thread, it's no urgent issue, and I'm inclined to postpone the merge after 6.10 merge window. So let's brew the stuff well for now.
thanks,
Takashi