Merge pull request #6039 from hwsmm/fix-bass-resolution

Fix wrong bytes per sample in TrackBass
ppy · Oct 31, 2023 · 0bf4656 · 0bf4656
2 parents f1981a3 + 9756229
commit 0bf4656
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/osu.Framework/Audio/Track/TrackBass.cs b/osu.Framework/Audio/Track/TrackBass.cs
@@ -20,8 +20,6 @@ namespace osu.Framework.Audio.Track
 {
     public sealed class TrackBass : Track, IBassAudio, IBassAudioChannel
     {
-        public const int BYTES_PER_SAMPLE = 4;
-
         private Stream? dataStream;
 
         /// <summary>
@@ -106,14 +104,22 @@ internal TrackBass(Stream data, string name, bool quick = false)
                 // will be -1 in case of an error
                 double seconds = Bass.ChannelBytes2Seconds(activeStream, byteLength);
 
+                int channels = 2;
+
+                if (Bass.ChannelGetInfo(activeStream, out ChannelInfo info))
+                    channels = info.Channels;
+
                 bool success = seconds >= 0;
 
                 if (success)
                 {
                     Length = seconds * 1000;
 
+                    // Bass uses 16-bit samples by default if neither BassFlags.Byte nor BassFlags.Float is specified
+                    const int bytes_per_sample = 2;
+
                     // Bass does not allow seeking to the end of the track, so the last available position is 1 sample before.
-                    lastSeekablePosition = Bass.ChannelBytes2Seconds(activeStream, byteLength - BYTES_PER_SAMPLE) * 1000;
+                    lastSeekablePosition = Bass.ChannelBytes2Seconds(activeStream, byteLength - bytes_per_sample * channels) * 1000;
 
                     isLoaded = true;
 

diff --git a/osu.Framework/Audio/Track/Waveform.cs b/osu.Framework/Audio/Track/Waveform.cs
@@ -89,6 +89,8 @@ public Waveform(Stream? data)
 
                 fileCallbacks = new FileCallbacks(new DataStreamFileProcedures(data));
 
+                const int bytes_per_sample = 4;
+
                 int decodeStream = Bass.CreateStream(StreamSystem.NoBuffer, BassFlags.Decode | BassFlags.Float, fileCallbacks.Callbacks, fileCallbacks.Handle);
 
                 float[]? sampleBuffer = null;
@@ -102,7 +104,7 @@ public Waveform(Stream? data)
                     // Each "point" is generated from a number of samples, each sample contains a number of channels
                     int samplesPerPoint = (int)(info.Frequency * resolution * info.Channels);
 
-                    int bytesPerPoint = samplesPerPoint * TrackBass.BYTES_PER_SAMPLE;
+                    int bytesPerPoint = samplesPerPoint * bytes_per_sample;
 
                     int pointCount = (int)(length / bytesPerPoint);
 
@@ -111,15 +113,15 @@ public Waveform(Stream? data)
                     // Each iteration pulls in several samples
                     int bytesPerIteration = bytesPerPoint * points_per_iteration;
 
-                    sampleBuffer = ArrayPool<float>.Shared.Rent(bytesPerIteration / TrackBass.BYTES_PER_SAMPLE);
+                    sampleBuffer = ArrayPool<float>.Shared.Rent(bytesPerIteration / bytes_per_sample);
 
                     int pointIndex = 0;
 
                     // Read sample data
                     while (length > 0)
                     {
                         length = Bass.ChannelGetData(decodeStream, sampleBuffer, bytesPerIteration);
-                        int samplesRead = (int)(length / TrackBass.BYTES_PER_SAMPLE);
+                        int samplesRead = (int)(length / bytes_per_sample);
 
                         // Each point is composed of multiple samples
                         for (int i = 0; i < samplesRead && pointIndex < pointCount; i += samplesPerPoint)