diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2022-10-13 11:04:12 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2022-10-13 11:08:11 -0400 |
commit | 9d3d925295112a0080bc1d70fad170db9e1af2a9 (patch) | |
tree | f6fb6244519a9430aa97b303e417fba53799b2f0 /lib/rbcodec/codecs/libmad | |
parent | 418169aff8faf2cf90124cd95dba0af821cea73d (diff) | |
download | rockbox-9d3d925295112a0080bc1d70fad170db9e1af2a9.tar.gz rockbox-9d3d925295112a0080bc1d70fad170db9e1af2a9.zip |
Revert "RFC: Get rid of mpegplayer plugin"
This reverts commit d25d24812e8120c0eb133a412287ac030eb185c9.
Change-Id: I1563223e343fb1e2eda72a45823b38350025ff93
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, 29 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make index 479dd54773..6c50e1d201 100644 --- a/lib/rbcodec/codecs/libmad/libmad.make +++ b/lib/rbcodec/codecs/libmad/libmad.make | |||
@@ -7,9 +7,16 @@ | |||
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 | |||
10 | MADFLAGS = $(CODECFLAGS) -I$(RBCODECLIB_DIR)/codecs/libmad | 14 | MADFLAGS = $(CODECFLAGS) -I$(RBCODECLIB_DIR)/codecs/libmad |
11 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H | 15 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H -DHAVE_ASSERT_H |
12 | 16 | ||
17 | # MPEGplayer | ||
18 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER | ||
19 | |||
13 | # libmad | 20 | # libmad |
14 | MADLIB := $(CODECDIR)/libmad.a | 21 | MADLIB := $(CODECDIR)/libmad.a |
15 | MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES) | 22 | MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES) |
@@ -20,8 +27,26 @@ $(MADLIB): $(MADLIB_OBJ) | |||
20 | $(SILENT)$(shell rm -f $@) | 27 | $(SILENT)$(shell rm -f $@) |
21 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 28 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
22 | 29 | ||
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 | |||
23 | # pattern rules | 38 | # pattern rules |
24 | 39 | ||
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 | |||
25 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c | 50 | $(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c |
26 | $(SILENT)mkdir -p $(dir $@) | 51 | $(SILENT)mkdir -p $(dir $@) |
27 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ | 52 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \ |
diff --git a/lib/rbcodec/codecs/libmad/mad_iram.h b/lib/rbcodec/codecs/libmad/mad_iram.h index 5a315c0381..ac0b64cca9 100644 --- a/lib/rbcodec/codecs/libmad/mad_iram.h +++ b/lib/rbcodec/codecs/libmad/mad_iram.h | |||
@@ -35,9 +35,10 @@ | |||
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 | 38 | /* Code performs slower in IRAM on PP502x and there is no space in |
39 | S3C2440 doesn't have any IRAM available for codecs */ | 39 | mpegplayer on the PP5002. S3C2440 doesn't have any IRAM available for |
40 | #if defined(CPU_PP502x) | 40 | codecs */ |
41 | #if defined(CPU_PP502x) || (CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) | ||
41 | #define ICODE_SECTION_MPA_ARM .text | 42 | #define ICODE_SECTION_MPA_ARM .text |
42 | #define ICODE_ATTR_MPA_SYNTH | 43 | #define ICODE_ATTR_MPA_SYNTH |
43 | #else | 44 | #else |