Use the current ofsets as reference

mixxxdj · Aug 31, 2023 · 148269d · 148269d
1 parent 6d71453
commit 148269d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/.codespellignore b/.codespellignore
@@ -6,3 +6,4 @@ sord
 doubleClick
 sur
 jus
+caf
diff --git a/src/sources/soundsourcecoreaudio.cpp b/src/sources/soundsourcecoreaudio.cpp
@@ -3,8 +3,8 @@
 #include "engine/engine.h"
 #include "sources/mp3decoding.h"
 #include "util/logger.h"
-#include "util/math.h"
 #include "util/macosversion.h"
+#include "util/math.h"
 
 namespace mixxx {
 

diff --git a/src/test/soundproxy_test.cpp b/src/test/soundproxy_test.cpp
@@ -760,28 +760,51 @@ TEST_F(SoundSourceProxyTest, firstSoundTest) {
             {QStringLiteral("cover-test-alac.caf"), 1166},
             {QStringLiteral("cover-test.flac"), 1166},
             {QStringLiteral("cover-test-itunes-12.3.0-aac.m4a"),
-                    1168}, // FFmpeg 4.2.7-0ubuntu0.1 / 4.4.2-0ubuntu0.22.04.1
-                           // 5390 Media Foundation 10.0.17763.2989
-                           // 1166 CoreAudio Version 11.7.8 (Build 20G1351)
+#if defined(__WINDOWS__)
+                    1390}, // Media Foundation 10.0.17763.2989
+                           // Media Foundation 10.0.20348.1
+#else
+                    1166}, // FFmpeg 4.2.7-0ubuntu0.1
+                           // FFmpeg 4.4.2-0ubuntu0.22.04.1
+                           // FFmpeg 5.1.2 windows
+                           // CoreAudio Version 11.7.8 (Build 20G1351)
+                           // CoreAusio Version 12.6.7 (Build 21G651)
+#endif
+                           // 1168 FFmpeg 4.2.7-0ubuntu0.1
+
             {QStringLiteral("cover-test-ffmpeg-aac.m4a"),
-                    2048}, // FFmpeg 4.2.7-0ubuntu0.1
-                           // 1166 FFmpeg 4.4.2-0ubuntu0.22.04.1
-                           // 1166 FFmpeg 5.1.2 windows
-                           // 1112 CoreAudio Version 11.7.8 (Build 20G1351)
-                           // 1112 CoreAusio Version 12.6.7 (Build 21G651)
-                           // 3160 Media Foundation 10.0.17763.2989
-                           // 3160 Media Foundation 10.0.20348.1
+#if defined(__WINDOWS__)
+                    3160}, // Media Foundation 10.0.17763.2989
+                           // Media Foundation 10.0.20348.1
+#else
+                    1112}, // FFmpeg 4.2.7-0ubuntu0.1
+                           // FFmpeg 4.4.2-0ubuntu0.22.04.1
+                           // FFmpeg 5.1.2 windows
+                           // CoreAudio Version 11.7.8 (Build 20G1351)
+                           // CoreAusio Version 12.6.7 (Build 21G651)
+#endif
+
             {QStringLiteral("cover-test-itunes-12.7.0-alac.m4a"), 1166},
             {QStringLiteral("cover-test-png.mp3"),
-                    1752}, // MAD Linux / Windows
-                           // 584 FFmpeg
-                           // 0 CoreAudio Version 11.7.8 (Build 20G1351)
+#if defined(__LINUX__)
+                    1752}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_64BIT
+#elif defined(__WINDOWS__)
+                    1752}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_DEFAULT
+#else
+                    0},    // CoreAudio Version 11.7.8 (Build 20G1351)
+#endif
+
             {QStringLiteral("cover-test-vbr.mp3"),
+#if defined(__LINUX__)
                     3376}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_64BIT
-                           // 3326 MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_DEFAULT
+#elif defined(__WINDOWS__)
+                    3326}, // MAD: MPEG Audio Decoder 0.15.1 (beta) NDEBUG FPM_DEFAULT
                            // No offset compared to FPM_64BIT builds but rounding differences
-                           // 2318 CoreAudio Version 11.7.8 (Build 20G1351)
+#else
+                    2318}, // CoreAudio Version 11.7.8 (Build 20G1351)
+#endif
                            // 1166 FFmpeg
+
             {QStringLiteral("cover-test.ogg"), 1166},
             {QStringLiteral("cover-test.opus"), 1268},
             {QStringLiteral("cover-test.wav"), 1166},
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ sord @@
     doubleClick
     sur
     jus
+    caf