audio: cleanups & add a manual test

[PATCH 03/37] audio/adlib: drop ts_helper HWVoice field

Posted by marcandre.lureau@redhat.com 2 weeks, 3 days ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Previous commits made this dead code.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 audio/audio_int.h | 2 --
 audio/audio.c     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/audio/audio_int.h b/audio/audio_int.h
index b2b8002477c..20b4c87b0b6 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -77,7 +77,6 @@ typedef struct HWVoiceOut {
     struct audio_pcm_info info;
 
     f_sample *clip;
-    uint64_t ts_helper;
 
     STSampleBuffer mix_buf;
     void *buf_emul;
@@ -99,7 +98,6 @@ typedef struct HWVoiceIn {
     t_sample *conv;
 
     size_t total_samples_captured;
-    uint64_t ts_helper;
 
     STSampleBuffer conv_buf;
     void *buf_emul;
diff --git a/audio/audio.c b/audio/audio.c
index 86e674410ab..e5841d7f0e6 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1239,7 +1239,6 @@ static void audio_run_out(AudioBackend *s)
 #endif
 
         if (played) {
-            hw->ts_helper += played;
             audio_capture_mix_and_clear (hw, prev_rpos, played);
         }
 
@@ -1319,7 +1318,6 @@ static void audio_run_in(AudioBackend *s)
 
         min = audio_pcm_hw_find_min_in (hw);
         hw->total_samples_captured += captured - min;
-        hw->ts_helper += captured;
 
         for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
             sw->total_hw_samples_acquired -= min;
-- 
2.52.0

Re: [PATCH 03/37] audio/adlib: drop ts_helper HWVoice field

Posted by Mark Cave-Ayland 6 days, 9 hours ago

On 23/01/2026 07:49, marcandre.lureau@redhat.com wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Previous commits made this dead code.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   audio/audio_int.h | 2 --
>   audio/audio.c     | 2 --
>   2 files changed, 4 deletions(-)
> 
> diff --git a/audio/audio_int.h b/audio/audio_int.h
> index b2b8002477c..20b4c87b0b6 100644
> --- a/audio/audio_int.h
> +++ b/audio/audio_int.h
> @@ -77,7 +77,6 @@ typedef struct HWVoiceOut {
>       struct audio_pcm_info info;
>   
>       f_sample *clip;
> -    uint64_t ts_helper;
>   
>       STSampleBuffer mix_buf;
>       void *buf_emul;
> @@ -99,7 +98,6 @@ typedef struct HWVoiceIn {
>       t_sample *conv;
>   
>       size_t total_samples_captured;
> -    uint64_t ts_helper;
>   
>       STSampleBuffer conv_buf;
>       void *buf_emul;
> diff --git a/audio/audio.c b/audio/audio.c
> index 86e674410ab..e5841d7f0e6 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -1239,7 +1239,6 @@ static void audio_run_out(AudioBackend *s)
>   #endif
>   
>           if (played) {
> -            hw->ts_helper += played;
>               audio_capture_mix_and_clear (hw, prev_rpos, played);
>           }
>   
> @@ -1319,7 +1318,6 @@ static void audio_run_in(AudioBackend *s)
>   
>           min = audio_pcm_hw_find_min_in (hw);
>           hw->total_samples_captured += captured - min;
> -        hw->ts_helper += captured;
>   
>           for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
>               sw->total_hw_samples_acquired -= min;

Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>


ATB,

Mark.