From 8a260dad05f068727e538092ef9c56e714a7edb4 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 19 Dec 2023 21:50:33 +1100
Subject: [PATCH] Fix sample::FromSigned to not shift by a negative amount

---
 src/codecs/include/sample.hpp | 4 ++--
 src/codecs/miniflac.cpp       | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/codecs/include/sample.hpp b/src/codecs/include/sample.hpp
index f77284bb..937b6b79 100644
--- a/src/codecs/include/sample.hpp
+++ b/src/codecs/include/sample.hpp
@@ -34,9 +34,9 @@ constexpr auto Clip(int64_t v) -> Sample {
 
 constexpr auto FromSigned(int32_t src, uint_fast8_t bits) -> Sample {
   if (bits > 16) {
-    return src << (sizeof(Sample) * 8 - bits);
+    return src >> (bits - sizeof(Sample) * 8);
   } else if (bits < 16) {
-    return src << (bits - (sizeof(Sample) * 8));
+    return src << (sizeof(Sample) * 8 - bits);
   }
   return src;
 }
diff --git a/src/codecs/miniflac.cpp b/src/codecs/miniflac.cpp
index cc261f75..e4eadeca 100644
--- a/src/codecs/miniflac.cpp
+++ b/src/codecs/miniflac.cpp
@@ -147,8 +147,6 @@ auto MiniFlacDecoder::DecodeTo(cpp::span<sample::Sample> output)
 
   size_t samples_written = 0;
   if (current_sample_) {
-    const uint8_t shift = flac_->frame.header.bps - 16;
-
     while (*current_sample_ < flac_->frame.header.block_size) {
       if (samples_written + flac_->frame.header.channels >= output.size()) {
         // We can't fit the next full PCM frame into the buffer.
@@ -157,8 +155,9 @@ auto MiniFlacDecoder::DecodeTo(cpp::span<sample::Sample> output)
       }
 
       for (int channel = 0; channel < flac_->frame.header.channels; channel++) {
-        output[samples_written++] = sample::FromSigned(
-            samples_by_channel_[channel][*current_sample_] >> shift, 16);
+        output[samples_written++] =
+            sample::FromSigned(samples_by_channel_[channel][*current_sample_],
+                               flac_->frame.header.bps);
       }
       (*current_sample_)++;
     }