pcm: Add snd_pcm_audio_tstamp_type_t constants
PATCH 1/2 pcm: Add snd_pcm_audio_tstamp_type_t constants
From: David Henningsson <[email protected]>
These are mostly a copy-paste from the kernel headers. But since functions snd_pcm_audio_tstamp_config make use of these they should be added to the public API as well.
Reported-by Alex Moon <[email protected]>
Signed-off-by David Henningsson <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- include/pcm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
include/pcm.h +14 -0
@@ -350,6 +350,20 @@ typedef enum _snd_pcm_tstamp_type {SND_PCM_TSTAMP_TYPE_LAST =SND_PCM_TSTAMP_TYPE_MONOTONIC_RAW , } snd_pcm_tstamp_type_t; +typedef enum _snd_pcm_audio_tstamp_type { +/** +* first definition for backwards compatibility only, +* maps to wallclock/link time for HDAudio playback and DEFAULT/DMA time for everything else +*/ +SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT =0 , +SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT =1 ,/**< DMA time, reported as per hw_ptr */ +SND_PCM_AUDIO_TSTAMP_TYPE_LINK =2 ,/**< link time reported by sample or wallclock counter, reset on startup */ +SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE =3 ,/**< link time reported by sample or wallclock counter, not reset on startup */ +SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED =4 ,/**< link time estimated indirectly */ +SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED =5 ,/**< link time synchronized with system time */ +SND_PCM_AUDIO_TSTAMP_TYPE_LAST =SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED +}snd_pcm_audio_tstamp_type_t ; + typedef struct _snd_pcm_audio_tstamp_config { /* 5 of max 16 bits used */ unsigned int type_requested:4;
Signature · 1 line
2.26.2
PATCH 2/2 test/audio_time: Make use of SND_PCM_AUDIO_TSTAMP_TYPE constants
From: David Henningsson <[email protected]>
Also fixup the usage row which seemed wrong to me.
Signed-off-by David Henningsson <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- test/audio_time.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
test/audio_time.c +13 -13
@@ -32,7 +32,7 @@ static void usage(char *command)"-d, --delay add delay \n" "-D, --device=NAME select PCM by name \n" "-p, --playback playback tstamps \n" -"-t, --ts_type=TYPE Default(0),link(1),link_estimated(2),synchronized(3) \n" +"-t, --ts_type=TYPE Compat(0),default(1),link(2),link_absolute(3),link_estimated(4),link_synchronized(5) \n" "-r, --report show audio timestamp and accuracy validity\n" , command); }
@@ -201,17 +201,17 @@ int main(int argc, char *argv[]) goto _exit; } -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,0 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT ))printf ("Playback supports audio compat timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,1 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT ))printf ("Playback supports audio default timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,2 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_LINK ))printf ("Playback supports audio link timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,3 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE ))printf ("Playback supports audio link absolute timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,4 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED ))printf ("Playback supports audio link estimated timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,5 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_p,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED ))printf ("Playback supports audio link synchronized timestamps\n" );snd_pcm_sw_params_alloca (&swparams_p);
@@ -269,17 +269,17 @@ int main(int argc, char *argv[]) goto _exit; } -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,0 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_COMPAT ))printf ("Capture supports audio compat timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,1 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_DEFAULT ))printf ("Capture supports audio default timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,2 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_LINK ))printf ("Capture supports audio link timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,3 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ABSOLUTE ))printf ("Capture supports audio link absolute timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,4 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_ESTIMATED ))printf ("Capture supports audio link estimated timestamps\n" ); -if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,5 )) +if (snd_pcm_hw_params_supports_audio_ts_type (hwparams_c,SND_PCM_AUDIO_TSTAMP_TYPE_LINK_SYNCHRONIZED ))printf ("Capture supports audio link synchronized timestamps\n" );snd_pcm_sw_params_alloca (&swparams_c);
Signature · 1 line
2.26.2