summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-08-11 12:26:29 +1000
committerjacqueline <me@jacqueline.id.au>2023-08-11 12:26:29 +1000
commit9ddaca4fcbfac588128a8b655685030d2c9ca4c5 (patch)
tree8309999ecd6e8aa25824bb8eb2dc0dcdfe3544c0
parenta4ba7350a7a9b294d4efc347e339fad25ce297e5 (diff)
downloadtangara-fw-9ddaca4fcbfac588128a8b655685030d2c9ca4c5.tar.gz
remove unused dithering stuff
-rw-r--r--src/audio/include/sink_mixer.hpp3
-rw-r--r--src/audio/sink_mixer.cpp27
2 files changed, 0 insertions, 30 deletions
diff --git a/src/audio/include/sink_mixer.hpp b/src/audio/include/sink_mixer.hpp
index b4d25781..4a7627e8 100644
--- a/src/audio/include/sink_mixer.hpp
+++ b/src/audio/include/sink_mixer.hpp
@@ -41,9 +41,6 @@ class SinkMixer {
auto SetTargetFormat(const StreamInfo::Pcm& format) -> void;
auto HandleSamples(cpp::span<sample::Sample>, bool) -> size_t;
- auto ApplyDither(cpp::span<sample::Sample> samples, uint_fast8_t bits)
- -> void;
-
struct Args {
IAudioSink::Format format;
size_t samples_available;
diff --git a/src/audio/sink_mixer.cpp b/src/audio/sink_mixer.cpp
index 5e712582..79ff4fb7 100644
--- a/src/audio/sink_mixer.cpp
+++ b/src/audio/sink_mixer.cpp
@@ -180,22 +180,6 @@ auto SinkMixer::HandleSamples(cpp::span<sample::Sample> input, bool is_eos)
samples_used = input.size();
}
- /*
- if (target_format_.bits_per_sample == 16) {
- // FIXME: The source should have some kind of hint indicating whether it
- // needs dither, since some codecs (e.g. opus) apply their own dither.
- ApplyDither(output_source, 16);
-
- cpp::span<int16_t> dest{reinterpret_cast<int16_t*>(output_source.data()),
- output_source.size()};
- for (size_t i = 0; i < output_source.size(); i++) {
- dest[i] = sample::ToSigned16Bit(output_source[i]);
- }
-
- output_source = output_source.first(output_source.size() / 2);
- }
- */
-
size_t bytes_sent = 0;
size_t bytes_to_send = output_source.size_bytes();
while (bytes_sent < bytes_to_send) {
@@ -208,15 +192,4 @@ auto SinkMixer::HandleSamples(cpp::span<sample::Sample> input, bool is_eos)
return samples_used;
}
-auto SinkMixer::ApplyDither(cpp::span<sample::Sample> samples,
- uint_fast8_t bits) -> void {
- static uint32_t prnd;
- for (auto& s : samples) {
- prnd = (prnd * 0x19660dL + 0x3c6ef35fL) & 0xffffffffL;
- s = sample::Clip(
- static_cast<int64_t>(s) +
- (static_cast<int>(prnd) >> (sizeof(sample::Sample) - bits)));
- }
-}
-
} // namespace audio