diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-08-04 09:49:56 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2022-10-02 11:57:20 -0400 |
commit | d25d24812e8120c0eb133a412287ac030eb185c9 (patch) | |
tree | d1c336d5d81c39366672c86f30c484f96e24a469 /lib/rbcodec/codecs/libmad | |
parent | 9ce5b2a2eda5c7101898476adaa3533e0ba5db82 (diff) | |
download | rockbox-d25d24812e8120c0eb133a412287ac030eb185c9.tar.gz rockbox-d25d24812e8120c0eb133a412287ac030eb185c9.zip |
RFC: Get rid of mpegplayer plugin
It might have made sense once upon a time, but in today's world...
Change-Id: I5d638e6f7a2308c50ab12bd901338f02cf426aae
Diffstat (limited to 'lib/rbcodec/codecs/libmad')
-rw-r--r-- | lib/rbcodec/codecs/libmad/libmad.make | 25 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libmad/mad_iram.h | 7 |
2 files changed, 3 insertions, 29 deletions
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make index 6c50e1d201..479dd54773 100644 --- a/lib/rbcodec/codecs/libmad/libmad.make +++ b/lib/rbcodec/codecs/libmad/libmad.make | |||
@@ -7,16 +7,9 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | # we need to build two different mad libraries | ||
11 | # (one for codec, one for mpegplayer) | ||
12 | # so a little trickery is necessary | ||
13 | |||
14 | MADFLAGS = $(CODECFLAGS) -I$(RBCODECLIB_DIR)/codecs/libmad | 10 | MADFLAGS = $(CODECFLAGS) -I$(RBCODECLIB_DIR)/codecs/libmad |
15 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H | 11 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H |
16 | 12 | ||
17 | # MPEGplayer | ||
18 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER | ||
19 | |||
20 | # libmad | 13 | # libmad |
21 | MADLIB := $(CODECDIR)/libmad.a | 14 | MADLIB := $(CODECDIR)/libmad.a |
22 | MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES) | 15 | MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES) |
@@ -27,26 +20,8 @@ $(MADLIB): $(MADLIB_OBJ) | |||
27 | $(SILENT)$(shell rm -f $@) | 20 | $(SILENT)$(shell rm -f $@) |
28 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
29 | 22 | ||
30 | # libmad-mpeg | ||
31 | MPEGMADLIB := $(CODECDIR)/libmad-mpeg.a | ||
32 | MPEGMADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES) | ||
33 | MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(RBCODECLIB_DIR)/codecs/libmad,$(RBCODEC_BLD)/codecs/libmad-mpeg,$(MPEGMADLIB_SRC)))) | ||
34 | |||
35 | $(MPEGMADLIB): $(MPEGMADLIB_OBJ) | ||
36 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | ||
37 | |||
38 | # pattern rules | 23 | # pattern rules |
39 | 24 | ||
40 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.c | ||
41 | $(SILENT)mkdir -p $(dir $@) | ||
42 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
43 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ | ||
44 | |||
45 | $(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S | ||
46 | $(SILENT)mkdir -p $(dir $@) | ||
47 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | ||
48 | $(CC) $(MPEGMADFLAGS) -c $< -o $@ | ||
49 | |||
50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | 25 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c |
51 | $(SILENT)mkdir -p $(dir $@) | 26 | $(SILENT)mkdir -p $(dir $@) |
52 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
diff --git a/lib/rbcodec/codecs/libmad/mad_iram.h b/lib/rbcodec/codecs/libmad/mad_iram.h index ac0b64cca9..5a315c0381 100644 --- a/lib/rbcodec/codecs/libmad/mad_iram.h +++ b/lib/rbcodec/codecs/libmad/mad_iram.h | |||
@@ -35,10 +35,9 @@ | |||
35 | #define ICODE_ATTR_MPA_SYNTH | 35 | #define ICODE_ATTR_MPA_SYNTH |
36 | #define ICONST_ATTR_MPA_HUFFMAN | 36 | #define ICONST_ATTR_MPA_HUFFMAN |
37 | #else | 37 | #else |
38 | /* Code performs slower in IRAM on PP502x and there is no space in | 38 | /* Code performs slower in IRAM on PP502x |
39 | mpegplayer on the PP5002. S3C2440 doesn't have any IRAM available for | 39 | S3C2440 doesn't have any IRAM available for codecs */ |
40 | codecs */ | 40 | #if defined(CPU_PP502x) |
41 | #if defined(CPU_PP502x) || (CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) | ||
42 | #define ICODE_SECTION_MPA_ARM .text | 41 | #define ICODE_SECTION_MPA_ARM .text |
43 | #define ICODE_ATTR_MPA_SYNTH | 42 | #define ICODE_ATTR_MPA_SYNTH |
44 | #else | 43 | #else |