From ecd674e3154363b5d6594344f579a4e7fe7b3a4f Mon Sep 17 00:00:00 2001 From: paul Date: Sat, 25 Oct 2008 00:21:10 +0000 Subject: [PATCH] machete-technique at its finest: rather than think about merge functions, just remove them all because they are never used git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3049 0c269be4-1314-0410-8aa9-9f06e86f4224 --- drivers/alsa/memops.c | 113 ------------------------------------------ jack/memops.h | 19 ------- 2 files changed, 132 deletions(-) diff --git a/drivers/alsa/memops.c b/drivers/alsa/memops.c index 99c0bf9..b654345 100644 --- a/drivers/alsa/memops.c +++ b/drivers/alsa/memops.c @@ -602,57 +602,6 @@ void sample_move_dS_s16 (jack_default_audio_sample_t *dst, char *src, unsigned l } } -void sample_merge_d16_sS (char *dst, jack_default_audio_sample_t *src, unsigned long nsamples, unsigned long dst_skip, dither_state_t *state) -{ - int16_t val; - - /* ALERT: signed sign-extension portability !!! */ - - while (nsamples--) { - if (*src <= NORMALIZED_FLOAT_MIN) { - val = SAMPLE_16BIT_MIN; - } else if (*src >= NORMALIZED_FLOAT_MAX) { - val = SAMPLE_16BIT_MAX; - } else { - val = (int16_t) f_round (*src * SAMPLE_16BIT_SCALING); - } - - if (val > SAMPLE_16BIT_MAX - *((int16_t*)dst)) { - *((int16_t*) dst) = SAMPLE_16BIT_MAX; - } else { - *((int16_t*) dst) += val; - } - - dst += dst_skip; - src++; - } -} - -void sample_merge_d32u24_sS (char *dst, jack_default_audio_sample_t *src, unsigned long nsamples, unsigned long dst_skip, dither_state_t *state) -{ - int32_t val; - - while (nsamples--) { - - if (*src <= NORMALIZED_FLOAT_MIN) { - val = SAMPLE_16BIT_MIN; - } else if (*src >= NORMALIZED_FLOAT_MAX) { - val = SAMPLE_16BIT_MAX; - } else { - val = f_round (*src * SAMPLE_24BIT_SCALING); - } - - if (val > SAMPLE_24BIT_MAX - *((int32_t*) dst)) { - *((int32_t*) dst) = SAMPLE_24BIT_MAX; - } else { - *((int32_t*) dst) += val; - } - - dst += dst_skip; - src++; - } -} - void memset_interleave (char *dst, char val, unsigned long bytes, unsigned long unit_bytes, unsigned long skip_bytes) @@ -701,68 +650,6 @@ memcpy_fake (char *dst, char *src, unsigned long src_bytes, unsigned long foo, u memcpy (dst, src, src_bytes); } -void -merge_memcpy_d16_s16 (char *dst, char *src, unsigned long src_bytes, - unsigned long dst_skip_bytes, unsigned long src_skip_bytes) -{ - while (src_bytes) { - *((short *) dst) += *((short *) src); - dst += 2; - src += 2; - src_bytes -= 2; - } -} - -void -merge_memcpy_d32_s32 (char *dst, char *src, unsigned long src_bytes, - unsigned long dst_skip_bytes, unsigned long src_skip_bytes) - -{ - while (src_bytes) { - *((int *) dst) += *((int *) src); - dst += 4; - src += 4; - src_bytes -= 4; - } -} - -void -merge_memcpy_interleave_d16_s16 (char *dst, char *src, unsigned long src_bytes, - unsigned long dst_skip_bytes, unsigned long src_skip_bytes) -{ - while (src_bytes) { - *((short *) dst) += *((short *) src); - dst += dst_skip_bytes; - src += src_skip_bytes; - src_bytes -= 2; - } -} - -void -merge_memcpy_interleave_d32_s32 (char *dst, char *src, unsigned long src_bytes, - unsigned long dst_skip_bytes, unsigned long src_skip_bytes) -{ - while (src_bytes) { - *((int *) dst) += *((int *) src); - dst += dst_skip_bytes; - src += src_skip_bytes; - src_bytes -= 4; - } -} - -void -merge_memcpy_interleave_d24_s24 (char *dst, char *src, unsigned long src_bytes, - unsigned long dst_skip_bytes, unsigned long src_skip_bytes) -{ - while (src_bytes) { - int acc = (*(int *)dst & 0xFFFFFF) + (*(int *)src & 0xFFFFFF); - memcpy(dst, &acc, 3); - dst += dst_skip_bytes; - src += src_skip_bytes; - src_bytes -= 3; - } -} - void memcpy_interleave_d16_s16 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes) diff --git a/jack/memops.h b/jack/memops.h index 7bef51a..aae4caa 100644 --- a/jack/memops.h +++ b/jack/memops.h @@ -65,18 +65,6 @@ void sample_move_dS_s24 (jack_default_audio_sample_t *dst, char *sr void sample_move_dS_s16s (jack_default_audio_sample_t *dst, char *src, unsigned long nsamples, unsigned long src_skip); void sample_move_dS_s16 (jack_default_audio_sample_t *dst, char *src, unsigned long nsamples, unsigned long src_skip); -void sample_merge_d16_sS (char *dst, jack_default_audio_sample_t *src, unsigned long nsamples, unsigned long dst_skip, dither_state_t *state); -void sample_merge_d32u24_sS (char *dst, jack_default_audio_sample_t *src, unsigned long nsamples, unsigned long dst_skip, dither_state_t *state); - -static __inline__ void -sample_merge (jack_default_audio_sample_t *dst, jack_default_audio_sample_t *src, unsigned long cnt) { - while (cnt--) { - *dst += *src; - dst++; - src++; - } -} - static __inline__ void sample_memcpy (jack_default_audio_sample_t *dst, jack_default_audio_sample_t *src, unsigned long cnt) { memcpy (dst, src, cnt * sizeof (jack_default_audio_sample_t)); @@ -89,11 +77,4 @@ void memcpy_interleave_d16_s16 (char *dst, char *src, unsigned long src_by void memcpy_interleave_d24_s24 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes); void memcpy_interleave_d32_s32 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes); -void merge_memcpy_interleave_d16_s16 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes); -void merge_memcpy_interleave_d24_s24 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes); -void merge_memcpy_interleave_d32_s32 (char *dst, char *src, unsigned long src_bytes, unsigned long dst_skip_bytes, unsigned long src_skip_bytes); - -void merge_memcpy_d16_s16 (char *dst, char *src, unsigned long src_bytes, unsigned long foo, unsigned long bar); -void merge_memcpy_d32_s32 (char *dst, char *src, unsigned long src_bytes, unsigned long foo, unsigned long bar); - #endif /* __jack_memops_h__ */