From 4219f4b3fded74d7b07a54c3ba8661d7a18c3b6c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 21 Jun 2021 14:24:50 +0200 Subject: [PATCH] rate: Simplify with snd_pcm_channel_area_addr() Use the new common helper instead of the open code. Signed-off-by: Takashi Iwai --- rate-lav/rate_lavrate.c | 9 ++------- rate/rate_samplerate.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/rate-lav/rate_lavrate.c b/rate-lav/rate_lavrate.c index 2ab1d88..f78eea5 100644 --- a/rate-lav/rate_lavrate.c +++ b/rate-lav/rate_lavrate.c @@ -155,11 +155,6 @@ static void do_convert(struct rate_src *rate, } #if SND_PCM_RATE_PLUGIN_VERSION >= 0x010003 -static inline void *get_addr(const snd_pcm_channel_area_t *area, snd_pcm_uframes_t offset) -{ - return (char *)area->addr + (area->first + area->step * offset) / 8; -} - static void pcm_src_convert(void *obj, const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t dst_offset, @@ -169,8 +164,8 @@ static void pcm_src_convert(void *obj, unsigned int src_frames) { struct rate_src *rate = obj; - const void *src = get_addr(src_areas, src_offset); - void *dst = get_addr(dst_areas, dst_offset); + const void *src = snd_pcm_channel_area_addr(src_areas, src_offset); + void *dst = snd_pcm_channel_area_addr(dst_areas, dst_offset); do_convert(rate, dst, dst_frames, src, src_frames); } diff --git a/rate/rate_samplerate.c b/rate/rate_samplerate.c index af0bf98..dd0a416 100644 --- a/rate/rate_samplerate.c +++ b/rate/rate_samplerate.c @@ -166,11 +166,6 @@ static void do_convert(struct rate_src *rate, } #if SND_PCM_RATE_PLUGIN_VERSION >= 0x010003 -static inline void *get_addr(const snd_pcm_channel_area_t *area, snd_pcm_uframes_t offset) -{ - return (char *)area->addr + (area->first + area->step * offset) / 8; -} - static void pcm_src_convert(void *obj, const snd_pcm_channel_area_t *dst_areas, snd_pcm_uframes_t dst_offset, @@ -180,8 +175,8 @@ static void pcm_src_convert(void *obj, unsigned int src_frames) { struct rate_src *rate = obj; - const void *src = get_addr(src_areas, src_offset); - void *dst = get_addr(dst_areas, dst_offset); + const void *src = snd_pcm_channel_area_addr(src_areas, src_offset); + void *dst = snd_pcm_channel_area_addr(dst_areas, dst_offset); do_convert(rate, dst, dst_frames, src, src_frames); } -- 2.47.1