Merge branch 'master' into psobot/313

spotify · Nov 7, 2024 · 4a8dfd2 · 4a8dfd2
2 parents bbd4e59 + 1273304
commit 4a8dfd2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/pedalboard/juce_overrides/juce_PatchedMP3AudioFormat.cpp b/pedalboard/juce_overrides/juce_PatchedMP3AudioFormat.cpp
@@ -3323,6 +3323,10 @@ class PatchedMP3Reader : public AudioFormatReaderWithPosition {
       return false;
     }
 
+    if (numDestChannels == 0) {
+      return true;
+    }
+
     if (currentPosition != startSampleInFile) {
       if (!stream.seek((int)(startSampleInFile / samplesPerFrame - 1))) {
         currentPosition = -1;

diff --git a/tests/audio/correct/zero_channels.mp3 b/tests/audio/correct/zero_channels.mp3
diff --git a/tests/test_io.py b/tests/test_io.py
@@ -1271,6 +1271,13 @@ def test_real_mp3_parsing_with_no_header():
         assert f.read(f.frames).shape[1] == f.frames
 
 
+def test_real_mp3_parsing_with_no_channels():
+    filename = os.path.join(os.path.dirname(__file__), "audio", "correct", "zero_channels.mp3")
+    with pedalboard.io.AudioFile(filename) as f:
+        assert f.num_channels == 0
+        assert f.read(f.frames).shape == (0, 0)
+
+
 @pytest.mark.parametrize("samplerate", [44100, 32000])
 @pytest.mark.parametrize("chunk_size", [1, 2, 16])
 @pytest.mark.parametrize("target_samplerate", [44100, 32000, 22050, 1234.56])

diff --git a/tests/test_type_hints.py b/tests/test_type_hints.py
@@ -44,6 +44,10 @@ def get_env_with_pythonpath() -> Dict[str, str]:
     os.environ.get("CIBW_BUILD") is not None,
     reason="Unable to get MyPy tests working while in cibuildwheel",
 )
+@pytest.mark.skipif(
+    os.environ.get("CI") is not None,
+    reason="Unable to get MyPy tests working reliably on CI",
+)
 @pytest.mark.parametrize("filename", PASSING_FIXTURES)
 def test_mypy_passes(filename):
     # Run this test in a subprocess, as MyPy forcibly exits, killing PyTest:
@@ -63,6 +67,10 @@ def test_mypy_passes(filename):
     os.environ.get("CIBW_BUILD") is not None,
     reason="Unable to get MyPy tests working while in cibuildwheel",
 )
+@pytest.mark.skipif(
+    os.environ.get("CI") is not None,
+    reason="Unable to get MyPy tests working reliably on CI",
+)
 @pytest.mark.parametrize("filename", FAILING_FIXTURES)
 def test_mypy_fails(filename):
     # Run this test in a subprocess, as MyPy forcibly exits, killing PyTest: