Skip to content

Commit 7af2a13

Browse files
committed
MP3Decoder: Allow port to override the allocator
.. espressif will be able to put the mp3 data in faster RAM this way.
1 parent a8170f9 commit 7af2a13

File tree

3 files changed

+48
-4
lines changed

3 files changed

+48
-4
lines changed

py/circuitpy_defns.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,11 @@ SRC_MOD += $(addprefix lib/mp3/src/, \
782782
subband.c \
783783
trigtabs.c \
784784
)
785-
$(BUILD)/lib/mp3/src/buffers.o: CFLAGS += -include "py/misc.h" -D'MPDEC_ALLOCATOR(x)=m_malloc(x)' -D'MPDEC_FREE(x)=m_free(x)'
785+
$(BUILD)/lib/mp3/src/buffers.o: CFLAGS += -include "shared-module/audiomp3/__init__.h" -D'MPDEC_ALLOCATOR(x)=mp3_alloc(x)' -D'MPDEC_FREE(x)=mp3_free(x)'
786+
ifeq ($(CIRCUITPY_AUDIOMP3_USE_PORT_ALLOCATOR),1)
787+
SRC_COMMON_HAL_ALL += \
788+
audiomp3/__init__.c
789+
endif
786790
endif
787791

788792
ifeq ($(CIRCUITPY_GIFIO),1)

shared-module/audiomp3/__init__.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2024 Jeff Epler for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include <stdlib.h>
28+
#include "py/mpconfig.h"
29+
#include "py/misc.h"
30+
#include "shared-module/audiomp3/__init__.h"
31+
32+
MP_WEAK void *mp3_alloc(size_t sz) {
33+
return m_malloc_maybe(sz);
34+
}
35+
36+
MP_WEAK void mp3_free(void *ptr) {
37+
m_free(ptr);
38+
}

shared-module/audiomp3/__init__.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#ifndef MICROPY_INCLUDED_SHARED_MODULE_AUDIOMP3__INIT__H
28-
#define MICROPY_INCLUDED_SHARED_MODULE_AUDIOMP3__INIT__H
27+
#pragma once
2928

30-
#endif // MICROPY_INCLUDED_SHARED_MODULE_AUDIOMP3__INIT__H
29+
#include <stdlib.h>
30+
31+
extern void *mp3_alloc(size_t sz);
32+
extern void mp3_free(void *ptr);

0 commit comments

Comments
 (0)