From 9c6a4505c8a8ae0b6d79e2b1e0a68d6d3c5f6c67 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 21 Mar 2012 09:06:48 +0100 Subject: audio_format: remove the format SAMPLE_FORMAT_DSD_LSBFIRST This format is unused since the DSDIFF decoder plugin now reverses the bit order. --- src/audio_format.c | 3 --- src/audio_format.h | 8 -------- src/audio_parser.c | 10 ++-------- src/decoder/flac_pcm.c | 1 - src/output/alsa_output_plugin.c | 1 - src/output/oss_output_plugin.c | 1 - src/pcm_byteswap.c | 1 - src/pcm_convert.c | 8 ++------ src/pcm_format.c | 4 ---- src/pcm_mix.c | 2 -- src/pcm_volume.c | 1 - 11 files changed, 4 insertions(+), 36 deletions(-) diff --git a/src/audio_format.c b/src/audio_format.c index 8222f0a53..658197528 100644 --- a/src/audio_format.c +++ b/src/audio_format.c @@ -75,9 +75,6 @@ sample_format_to_string(enum sample_format format) case SAMPLE_FORMAT_DSD: return "dsd"; - case SAMPLE_FORMAT_DSD_LSBFIRST: - return "dsdl"; - case SAMPLE_FORMAT_DSD_OVER_USB: return "dsdusb"; } diff --git a/src/audio_format.h b/src/audio_format.h index 5bb2ed9fb..293dee1c1 100644 --- a/src/audio_format.h +++ b/src/audio_format.h @@ -56,12 +56,6 @@ enum sample_format { */ SAMPLE_FORMAT_DSD, - /** - * Same as #SAMPLE_FORMAT_DSD, but the least significant bit - * comes first. - */ - SAMPLE_FORMAT_DSD_LSBFIRST, - /** * DSD packed in 24 bit samples (no padding), according to the * dCS suggested standard: @@ -195,7 +189,6 @@ audio_valid_sample_format(enum sample_format format) case SAMPLE_FORMAT_S32: case SAMPLE_FORMAT_FLOAT: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: return true; @@ -275,7 +268,6 @@ sample_format_size(enum sample_format format) return 4; case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: /* each frame has 8 samples per channel */ return 1; diff --git a/src/audio_parser.c b/src/audio_parser.c index 4ee2bda0c..d2d8dc950 100644 --- a/src/audio_parser.c +++ b/src/audio_parser.c @@ -94,14 +94,8 @@ parse_sample_format(const char *src, bool mask, } if (memcmp(src, "dsd", 3) == 0) { - if (src[3] == 'l') { - *sample_format_r = SAMPLE_FORMAT_DSD_LSBFIRST; - *endptr_r = src + 4; - } else { - *sample_format_r = SAMPLE_FORMAT_DSD; - *endptr_r = src + 3; - } - + *sample_format_r = SAMPLE_FORMAT_DSD; + *endptr_r = src + 3; return true; } diff --git a/src/decoder/flac_pcm.c b/src/decoder/flac_pcm.c index 5f7d382a1..480fd6393 100644 --- a/src/decoder/flac_pcm.c +++ b/src/decoder/flac_pcm.c @@ -104,7 +104,6 @@ flac_convert(void *dest, case SAMPLE_FORMAT_S24: case SAMPLE_FORMAT_FLOAT: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: case SAMPLE_FORMAT_UNDEFINED: /* unreachable */ diff --git a/src/output/alsa_output_plugin.c b/src/output/alsa_output_plugin.c index 4a51fcaed..adfbc9f0d 100644 --- a/src/output/alsa_output_plugin.c +++ b/src/output/alsa_output_plugin.c @@ -195,7 +195,6 @@ get_bitformat(enum sample_format sample_format) switch (sample_format) { case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: return SND_PCM_FORMAT_UNKNOWN; diff --git a/src/output/oss_output_plugin.c b/src/output/oss_output_plugin.c index 0868cf7e7..2309f0f3c 100644 --- a/src/output/oss_output_plugin.c +++ b/src/output/oss_output_plugin.c @@ -397,7 +397,6 @@ sample_format_to_oss(enum sample_format format) case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_FLOAT: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: return AFMT_QUERY; diff --git a/src/pcm_byteswap.c b/src/pcm_byteswap.c index f57957a94..d56c3a87c 100644 --- a/src/pcm_byteswap.c +++ b/src/pcm_byteswap.c @@ -76,7 +76,6 @@ pcm_byteswap(struct pcm_buffer *buffer, enum sample_format format, case SAMPLE_FORMAT_S8: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: return src; case SAMPLE_FORMAT_S16: diff --git a/src/pcm_convert.c b/src/pcm_convert.c index 2dfd3c734..4721d2496 100644 --- a/src/pcm_convert.c +++ b/src/pcm_convert.c @@ -81,7 +81,6 @@ pcm_convert_channels(struct pcm_buffer *buffer, enum sample_format format, case SAMPLE_FORMAT_S24: case SAMPLE_FORMAT_FLOAT: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: g_set_error(error_r, pcm_convert_quark(), 0, "Channel conversion not implemented for format '%s'", @@ -408,14 +407,11 @@ pcm_convert(struct pcm_convert_state *state, } struct audio_format float_format; - if (src_format->format == SAMPLE_FORMAT_DSD || - src_format->format == SAMPLE_FORMAT_DSD_LSBFIRST) { + if (src_format->format == SAMPLE_FORMAT_DSD) { size_t f_size; - const bool lsbfirst = - src_format->format == SAMPLE_FORMAT_DSD_LSBFIRST; const float *f = pcm_dsd_to_float(&state->dsd, src_format->channels, - lsbfirst, src, src_size, + false, src, src_size, &f_size); if (f == NULL) { g_set_error_literal(error_r, pcm_convert_quark(), 0, diff --git a/src/pcm_format.c b/src/pcm_format.c index ecc1ee1c9..31de2200e 100644 --- a/src/pcm_format.c +++ b/src/pcm_format.c @@ -148,7 +148,6 @@ pcm_convert_to_16(struct pcm_buffer *buffer, struct pcm_dither *dither, switch (src_format) { case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: break; @@ -269,7 +268,6 @@ pcm_convert_to_24(struct pcm_buffer *buffer, switch (src_format) { case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: break; @@ -396,7 +394,6 @@ pcm_convert_to_32(struct pcm_buffer *buffer, switch (src_format) { case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: break; @@ -534,7 +531,6 @@ pcm_convert_to_float(struct pcm_buffer *buffer, switch (src_format) { case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: break; diff --git a/src/pcm_mix.c b/src/pcm_mix.c index 0fb7b6dcd..45cc8fe9d 100644 --- a/src/pcm_mix.c +++ b/src/pcm_mix.c @@ -121,7 +121,6 @@ pcm_add_vol(void *buffer1, const void *buffer2, size_t size, case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_S24: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: /* not implemented */ return false; @@ -233,7 +232,6 @@ pcm_add(void *buffer1, const void *buffer2, size_t size, case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_S24: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: /* not implemented */ return false; diff --git a/src/pcm_volume.c b/src/pcm_volume.c index c83ee0f7f..42beeb9bd 100644 --- a/src/pcm_volume.c +++ b/src/pcm_volume.c @@ -160,7 +160,6 @@ pcm_volume(void *buffer, size_t length, case SAMPLE_FORMAT_UNDEFINED: case SAMPLE_FORMAT_S24: case SAMPLE_FORMAT_DSD: - case SAMPLE_FORMAT_DSD_LSBFIRST: case SAMPLE_FORMAT_DSD_OVER_USB: /* not implemented */ return false; -- cgit v1.2.3