Repository navigation
Resync the CircuitPython modules with 11.0.0-alpha.2 - #313
Merged
Merged
Conversation
…sat16 audiomixer (11a329885, fc57c0f36; adafruit/circuitpython#11617): a voice is scaled as (ai * mul) >> 15 where it was ai * (mul / 32767.0f) truncated toward zero, and a centred pan is 32768 - panning where it was 32767 - panning. Taken in upstream's words in src/audiomixer/Mixer.c, in the CPython extension's scaling kernel and in src/cpython/audiomixer.py, whose float32 helpers go. Every level below 1.0 moves by up to one LSB, and a small negative sample now rounds down (-1 at level 0.5 stays -1). A voice at level 1.0 is a wire without help, so the unity branch this port added in audiodsp#95 is deleted, and a stereo voice at pan 0 no longer has its left channel one step below the right. The CPython target's block-level pass-through at unity is keyed on Q15 32768 alone now: 32767 no longer multiplies by exactly 1. synthio (cbbde1208; adafruit/circuitpython#11621): synthio_sat16 is inline in src/synthio/__init__.h as upstream has it, with __ssat on cores that define __ARM_FEATURE_SAT. The rounding is the same arithmetic without a branch, so no sample changes. mixer_q15_level_probe.py replaces mixer_level_precision_probe.py, whose material was the float32-versus-float64 flips that no longer exist. It renders the rails and the values either side of zero at four levels and five pans, mono and stereo, and verify_dsp.py holds CircuitPython, MicroPython and CPython to the same bytes. test_cpython_audiomixer_level.py and test_cpython_mixer_scale.py are rewritten around the integer arithmetic.
…gests CIRCUITPYTHON_ORACLE names d53b2277c, and tests/test_voice_ceiling_consistency.py pins the sha256 of the 64-voice binary built from it (ee0cc93c...). Two stored digests moved with the integer mixer, re-captured from the new oracle's own output, which CPython and desktop MicroPython reproduce: - streaming_component, streaming half: f3ffad8e... to 33b27a2f.... The mixer voices in streaming_component_probe.py are below unity. - synthtools_acceptance: b6e3b06f... to 757d944a.... The lead, bend and bass lines moved; the other five lines are unchanged. Every other stored digest held and reproduces on the new oracle: midi_component, effects_component, biquad_component and mixdown_knee. The oracle labels in effects_component and streaming_component follow the pin.
upstream-sync.md gets the new "last resync" entry (the alpha.1 one becomes the one before it), upstream-diff.md says what upstream's integer mixer changed and which digests moved, and the audiodsp#95 section becomes a record of a difference upstream now shares, as the alpha.1 resync did for its five.
A float32 MicroPython build prints 100 / 127 with fewer digits than CPython, so the probe's label line differed where the samples agreed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the oracle pin from CircuitPython 11.0.0-alpha.1 to 11.0.0-alpha.2 (d53b2277c) and takes the three upstream commits that touched the ported modules in between. All three are in
audiomixerandsynthio_sat16; nothing else in the eight modules changed, andlib/mp3is the same commit.What upstream changed
(ai * mul) >> 15, where it wasai * (mul / 32767.0f)truncated toward zero, and a centred pan is32768 - panning, where it was32767 - panning. Taken as upstream has it insrc/audiomixer/Mixer.c, the CPython scaling kernel andsrc/cpython/audiomixer.py.synthio_sat16(cbbde1208; #11621). Taken insrc/synthio/__init__.h. The branch-free rounding is the same arithmetic, so no sample changes.What moved, and why
Every mixer level below 1.0 moves by up to one LSB, and a small negative sample now rounds down (-1 at level 0.5 stays -1). A voice at level 1.0 is a wire without help, so this port's unity branch (audiodsp#95) is deleted and that difference is retired; a stereo voice at pan 0 no longer has its left channel a step below the right. On the CPython target the pass-through at unity is keyed on Q15 32768 alone, since 32767 no longer multiplies by exactly 1.
Stored digests that moved, both re-captured from the new oracle's own output (CPython and desktop MicroPython reproduce it):
streaming_component, streaming half:f3ffad8e...to33b27a2f...(its mixer voices are below unity).synthtools_acceptance:b6e3b06f...to757d944a...(thelead,bendandbasslines; the other five are unchanged).Held, and reproduced by the new oracle:
midi_component,effects_component,biquad_component,mixdown_knee.The oracle is
bin/circuitpython-oracle-11.0.0-alpha.2, 64 voices, sha256ee0cc93c12691859ec1588df89e1839056cef52d4c95ed0515a14d2461757b66, pinned intests/test_voice_ceiling_consistency.py.mixer_q15_level_probe.pyreplacesmixer_level_precision_probe.py(its float32-versus-float64 flips no longer exist). A MicroPython build from before the change prints different bytes from the oracle on it, and the new build prints the same.Gates
verify_dsp.pywith--micropythonand--circuitpython(the alpha.2 oracle): 106 comparisons, 0 failures.verify_acceptance,verify_effects,verify_streaming,verify_biquad,verify_mixdown_knee) pass on the new goldens;cp11_files_probe.pyprints its PASS line on MicroPython and on the oracle.python -m unittest discover -s tests: 576 tests, OK (3 skipped); flake8 clean.Recorded in
docs/upstream-sync.mdanddocs/upstream-diff.md.