diff options
Diffstat (limited to 'apps/codecs/libm4a')
-rw-r--r-- | apps/codecs/libm4a/Makefile | 43 | ||||
-rw-r--r-- | apps/codecs/libm4a/demux.c | 5 | ||||
-rw-r--r-- | apps/codecs/libm4a/libm4a.make | 24 | ||||
-rw-r--r-- | apps/codecs/libm4a/m4a.c | 7 |
4 files changed, 28 insertions, 51 deletions
diff --git a/apps/codecs/libm4a/Makefile b/apps/codecs/libm4a/Makefile deleted file mode 100644 index 1bc71e50b7..0000000000 --- a/apps/codecs/libm4a/Makefile +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | INCLUDES=-I$(APPSDIR) -I.. -I. -I$(FIRMDIR)/include -I$(FIRMDIR)/export \ | ||
11 | -I$(FIRMDIR)/common -I$(FIRMDIR)/drivers -I$(BUILDDIR) | ||
12 | |||
13 | ifdef APPEXTRA | ||
14 | INCLUDES += $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | ||
15 | endif | ||
16 | |||
17 | M4AOPTS = -O3 | ||
18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(M4AOPTS) $(TARGET) \ | ||
19 | $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} $(PROFILE_OPTS) | ||
20 | |||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | ||
22 | include $(TOOLSDIR)/makesrc.inc | ||
23 | |||
24 | SOURCES = $(SRC) | ||
25 | OBJS2 := $(SRC:%.c=$(OBJDIR)/%.o) | ||
26 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | ||
27 | DEPFILE = $(OBJDIR)/dep-libm4a | ||
28 | DIRS = | ||
29 | |||
30 | all: $(OUTPUT) | ||
31 | |||
32 | $(OUTPUT): $(OBJS) | ||
33 | $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1 | ||
34 | $(SILENT)$(RANLIB) $@ | ||
35 | |||
36 | include $(TOOLSDIR)/make.inc | ||
37 | |||
38 | clean: | ||
39 | $(call PRINTS,cleaning libm4a)rm -f $(OBJS) $(OUTPUT) $(DEPFILE) | ||
40 | |||
41 | ifneq ($(MAKECMDGOALS),clean) | ||
42 | -include $(DEPFILE) | ||
43 | endif | ||
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c index 912e7327e7..e9b5c2c482 100644 --- a/apps/codecs/libm4a/demux.c +++ b/apps/codecs/libm4a/demux.c | |||
@@ -33,11 +33,14 @@ | |||
33 | #include <inttypes.h> | 33 | #include <inttypes.h> |
34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | 35 | ||
36 | #include "../codec.h" | 36 | #include "codeclib.h" |
37 | 37 | ||
38 | #include "m4a.h" | 38 | #include "m4a.h" |
39 | 39 | ||
40 | #if defined(DEBUG) || defined(SIMULATOR) | 40 | #if defined(DEBUG) || defined(SIMULATOR) |
41 | #ifdef DEBUGF | ||
42 | #undef DEBUGF | ||
43 | #endif | ||
41 | #define DEBUGF qtmovie->stream->ci->debugf | 44 | #define DEBUGF qtmovie->stream->ci->debugf |
42 | #else | 45 | #else |
43 | #define DEBUGF(...) | 46 | #define DEBUGF(...) |
diff --git a/apps/codecs/libm4a/libm4a.make b/apps/codecs/libm4a/libm4a.make new file mode 100644 index 0000000000..6c092bad5e --- /dev/null +++ b/apps/codecs/libm4a/libm4a.make | |||
@@ -0,0 +1,24 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id: Makefile 19082 2008-11-10 23:54:24Z zagor $ | ||
8 | # | ||
9 | |||
10 | # libm4a | ||
11 | M4ALIB := $(CODECDIR)/libm4a.a | ||
12 | M4ALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libm4a/SOURCES) | ||
13 | M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC)) | ||
14 | OTHER_SRC += $(M4ALIB_SRC) | ||
15 | |||
16 | $(M4ALIB): $(M4ALIB_OBJ) | ||
17 | $(call PRINTS,AR $(@F))$(AR) rs $@ $^ >/dev/null 2>&1 | ||
18 | |||
19 | M4AFLAGS = $(filter-out -O%,$(CODECFLAGS)) | ||
20 | M4AFLAGS += -O3 | ||
21 | |||
22 | $(CODECDIR)/libm4a/%.o: $(ROOTDIR)/apps/codecs/libm4a/%.c | ||
23 | $(SILENT)mkdir -p $(dir $@) | ||
24 | $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(M4AFLAGS) -c $< -o $@ | ||
diff --git a/apps/codecs/libm4a/m4a.c b/apps/codecs/libm4a/m4a.c index da3e912b8a..f0666403ed 100644 --- a/apps/codecs/libm4a/m4a.c +++ b/apps/codecs/libm4a/m4a.c | |||
@@ -23,13 +23,6 @@ | |||
23 | #include <inttypes.h> | 23 | #include <inttypes.h> |
24 | #include "m4a.h" | 24 | #include "m4a.h" |
25 | 25 | ||
26 | #if defined(DEBUG) || defined(SIMULATOR) | ||
27 | extern struct codec_api* rb; | ||
28 | #define DEBUGF rb->debugf | ||
29 | #else | ||
30 | #define DEBUGF(...) | ||
31 | #endif | ||
32 | |||
33 | /* Implementation of the stream.h functions used by libalac */ | 26 | /* Implementation of the stream.h functions used by libalac */ |
34 | 27 | ||
35 | #define _Swap32(v) do { \ | 28 | #define _Swap32(v) do { \ |