提交: 6cc221fe7d63ae26dadcbc00cb86cc8ace1693bd - satousynth (hg)

VGM playback library for Common Lisp

Commit MetaInfo

• 修訂: 6cc221fe7d63ae26dadcbc00cb86cc8ace1693bd (tree)
• 時間: 2023-08-19 22:51:14
• 作者: Remilia Scarlet <remilia@post...>
• Commiter: Remilia Scarlet

Log Message

Change fill-buffers so that it matches YunoSynth's behavior

Change Summary

• modified: src/vgm-player.lisp

差異

diff -r 1c7f18f23b9c -r 6cc221fe7d63 src/vgm-player.lisp
--- a/src/vgm-player.lisp	Sat Aug 19 07:50:50 2023 -0600
+++ b/src/vgm-player.lisp	Sat Aug 19 07:51:14 2023 -0600
@@ -582,8 +582,11 @@
                      #-satou-wd40 (safety 1)))
 
   (let ((cur-volume (truncate (%player-output-volume player)))
-        (buf (%player-temp-buf player)))
-    (declare (type fixnum cur-volume))
+        (buf (%player-temp-buf player))
+        (out-l 0)
+        (out-r 0))
+    (declare (type fixnum cur-volume)
+             (type t/int32 out-l out-r))
 
     #-satou-wd40 (unless (= (length left) (length right))
                    (error "Buffer size mismatch"))
@@ -594,14 +597,20 @@
              (%player-interpret-file player 1)
              (resampler-resample (%player-resampler player) (%player-chip-table player) buf 1)
 
-             ;; Adjust the volume.
-             (setf (sample-left buf) (ash (coerce-to-int32 (* (ash (sample-left buf) -5) cur-volume)) -11))
-             (setf (sample-right buf) (ash (coerce-to-int32 (* (ash (sample-right buf) -5) cur-volume)) -11))
+             ;; Adjust the volume for the output
+             (setf out-l (sdm:clamp (* (sample-left buf) cur-volume) #.(- (expt 2 31)) #.(1- (expt 2 31))))
+             (setf out-r (sdm:clamp (* (sample-right buf) cur-volume) #.(- (expt 2 31)) #.(1- (expt 2 31))))
 
              ;; Store the new sample
              (muffling
-               (setf (aref left sample-num) (* (%player-clamp-int32-to-int16 (sample-left buf)) +inv-int-16+))
-               (setf (aref right sample-num) (* (%player-clamp-int32-to-int16 (sample-right buf)) +inv-int-16+)))))
+              (setf (aref left sample-num) (* out-l #.(/ 1.0 (1- (expt 2 31)))))
+              (setf (aref right sample-num) (* out-r #.(/ 1.0 (1- (expt 2 31))))))
+              ;; (* (%player-clamp-int32-to-int16 (sample-left buf)) +inv-int-16+))
+              ;;(setf (aref right sample-num) out-r)) ;; (* (%player-clamp-int32-to-int16 (sample-right buf)) +inv-int-16+)))
+
+             ;; Still needs to be adjusted for the resampler
+             (setf (sample-left buf) (ash (coerce-to-int32 (* (ash (sample-left buf) -5) cur-volume)) -11))
+             (setf (sample-right buf) (ash (coerce-to-int32 (* (ash (sample-right buf) -5) cur-volume)) -11))))
   nil)
 
 (define-typed-fn %player-reset-chips ((vgm-player player))