Skip to content

Merge 7.2.x #6234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Apr 5, 2022
Merged

Merge 7.2.x #6234

merged 19 commits into from
Apr 5, 2022

Conversation

jepler
Copy link

@jepler jepler commented Apr 4, 2022

Entering as a draft, because it should be updated after any/all other PRs are merged to 7.2.x. I just wanted to get this started because there was a merge conflict.

dhalbert and others added 18 commits March 29, 2022 10:46
Some audio implementations, notably samd, really don't like it when
you return 0 samples of data. This was the case when reaching the
end of an MP3 file.

Now, we read forward in an MP3 file to the next sync word during
"get_buffer", so that we can accurately return GET_BUFFER_DONE when the
NEXT call WOULD HAVE resulted in 0 samples.

Tested with @gamblor21's "laugh.mp3" file on a Trellis M4 Express.
This warning can happen on clang 13.0.1 building mpy-cross:

../py/vm.c:748:25: error: array index -3 refers past the last possible
  element for an array in 64-bit address space containing 64-bit (8-byte)
  elements (max possible 2305843009213693952 elements)
  [-Werror,-Warray-bounds]
                        sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL;
                        ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~

Using pointer access instead of array access works around this warning.

Fixes issue adafruit#8467.

Signed-off-by: Damien George <[email protected]>
nrf: Correctly mark PWM unused during reset
MP3Decoder: Accurately inform when no more data
py/vm: Prevent array bound warning when using -MP_OBJ_ITER_BUF_NSLOTS.
…t-rtic-interrupt

handle clearing both RXIC and RTIC interrupts
Free ringbuf buffer by relying on gc, not gc_free()
@jepler jepler reopened this Apr 5, 2022
@jepler jepler marked this pull request as ready for review April 5, 2022 13:45
@jepler jepler requested a review from dhalbert April 5, 2022 14:06
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving in advance.

@dhalbert dhalbert merged commit 359d8e5 into adafruit:main Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants