Add codecs to librbcodec.

Change-Id: Id7f4717d51ed02d67cb9f9cb3c0ada4a81843f97
Reviewed-on: http://gerrit.rockbox.org/137
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Tested-by: Nils Wallménius <nils@rockbox.org>

android/android.make

@@ -124,7 +124,7 @@ $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
 $(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
 	$(call PRINTS,CP rockbox.zip)cp $^ $@
 
-$(BINLIB_DIR)/lib%.so: $(BUILDDIR)/apps/codecs/%.codec
+$(BINLIB_DIR)/lib%.so: $(RBCODEC_BLD)/codecs/%.codec
 	$(call PRINTS,CP $(@F))cp $^ $@
 
 libs: $(DIRS) $(LIBS)

apps/codecs/lib/fixedpoint.c

@@ -1 +0,0 @@
-#include "../../fixedpoint.c"

apps/plugins/plugins.make

@@ -87,7 +87,7 @@ $(BUILDDIR)/credits.raw credits.raw: $(DOCSDIR)/CREDITS
 	$(call PRINTS,Create credits.raw)perl $(APPSDIR)/plugins/credits.pl < $< > $(BUILDDIR)/$(@F)
 
 # special dependencies
-$(BUILDDIR)/apps/plugins/wav2wv.rock: $(BUILDDIR)/apps/codecs/libwavpack.a $(PLUGIN_LIBS)
+$(BUILDDIR)/apps/plugins/wav2wv.rock: $(RBCODEC_BLD)/codecs/libwavpack.a $(PLUGIN_LIBS)
 
 # Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim
 ifeq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)

firmware/target/hosted/ypr0/ypr0.make

@@ -16,7 +16,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
 	$(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
 		-L$(BUILDDIR)/firmware -lfirmware \
-		-L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+		-L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
 		-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
 		$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 

lib/rbcodec/codecs/a52_rm.c

@@ -45,7 +45,7 @@ static void init_rm(RMContext *rmctx)
 /* used outside liba52 */
 static uint8_t buf[3840] IBSS_ATTR;
 
-/* The following two functions, a52_decode_data and output_audio are taken from apps/codecs/a52.c */
+/* The following two functions, a52_decode_data and output_audio are taken from a52.c */
 static inline void output_audio(sample_t *samples)
 {
     ci->yield();

lib/rbcodec/codecs/codecs.h

@@ -22,7 +22,7 @@
 #define _CODECS_H_
 
 /* instruct simulator code to not redefine any symbols when compiling codecs.
-   (the CODEC macro is defined in apps/codecs/Makefile) */
+   (the CODEC macro is defined in codecs.make) */
 #ifdef CODEC
 #define NO_REDEFINES_PLEASE
 #endif

lib/rbcodec/codecs/codecs.make

@@ -7,54 +7,54 @@
 # $Id$
 #
 
-CODECDIR = $(BUILDDIR)/apps/codecs
-CODECS_SRC := $(call preprocess, $(APPSDIR)/codecs/SOURCES)
+CODECDIR = $(RBCODEC_BLD)/codecs
+CODECS_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/SOURCES)
 OTHER_SRC += $(CODECS_SRC)
 
 CODECS := $(CODECS_SRC:.c=.codec)
-CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS))
+CODECS := $(subst $(RBCODECLIB_DIR),$(RBCODEC_BLD),$(CODECS))
 
 # the codec helper library
-include $(APPSDIR)/codecs/lib/libcodec.make
-OTHER_INC += -I$(APPSDIR)/codecs/lib
+include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
+OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
 
 # extra libraries
 CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB)
 
 # the codec libraries
-include $(APPSDIR)/codecs/demac/libdemac.make
-include $(APPSDIR)/codecs/liba52/liba52.make
-include $(APPSDIR)/codecs/libalac/libalac.make
-include $(APPSDIR)/codecs/libasap/libasap.make
-include $(APPSDIR)/codecs/libasf/libasf.make
-include $(APPSDIR)/codecs/libfaad/libfaad.make
-include $(APPSDIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
-include $(APPSDIR)/codecs/libm4a/libm4a.make
-include $(APPSDIR)/codecs/libmad/libmad.make
-include $(APPSDIR)/codecs/libmusepack/libmusepack.make
-include $(APPSDIR)/codecs/libspc/libspc.make
-include $(APPSDIR)/codecs/libspeex/libspeex.make
-include $(APPSDIR)/codecs/libtremor/libtremor.make
-include $(APPSDIR)/codecs/libwavpack/libwavpack.make
-include $(APPSDIR)/codecs/libwma/libwma.make
-include $(APPSDIR)/codecs/libwmapro/libwmapro.make
-include $(APPSDIR)/codecs/libcook/libcook.make
-include $(APPSDIR)/codecs/librm/librm.make
-include $(APPSDIR)/codecs/libatrac/libatrac.make
-include $(APPSDIR)/codecs/libpcm/libpcm.make
-include $(APPSDIR)/codecs/libtta/libtta.make
-include $(APPSDIR)/codecs/libgme/libay.make
-include $(APPSDIR)/codecs/libgme/libgbs.make
-include $(APPSDIR)/codecs/libgme/libhes.make
-include $(APPSDIR)/codecs/libgme/libnsf.make
-include $(APPSDIR)/codecs/libgme/libsgc.make
-include $(APPSDIR)/codecs/libgme/libvgm.make
-include $(APPSDIR)/codecs/libgme/libkss.make
-include $(APPSDIR)/codecs/libgme/libemu2413.make
+include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
+include $(RBCODECLIB_DIR)/codecs/liba52/liba52.make
+include $(RBCODECLIB_DIR)/codecs/libalac/libalac.make
+include $(RBCODECLIB_DIR)/codecs/libasap/libasap.make
+include $(RBCODECLIB_DIR)/codecs/libasf/libasf.make
+include $(RBCODECLIB_DIR)/codecs/libfaad/libfaad.make
+include $(RBCODECLIB_DIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
+include $(RBCODECLIB_DIR)/codecs/libm4a/libm4a.make
+include $(RBCODECLIB_DIR)/codecs/libmad/libmad.make
+include $(RBCODECLIB_DIR)/codecs/libmusepack/libmusepack.make
+include $(RBCODECLIB_DIR)/codecs/libspc/libspc.make
+include $(RBCODECLIB_DIR)/codecs/libspeex/libspeex.make
+include $(RBCODECLIB_DIR)/codecs/libtremor/libtremor.make
+include $(RBCODECLIB_DIR)/codecs/libwavpack/libwavpack.make
+include $(RBCODECLIB_DIR)/codecs/libwma/libwma.make
+include $(RBCODECLIB_DIR)/codecs/libwmapro/libwmapro.make
+include $(RBCODECLIB_DIR)/codecs/libcook/libcook.make
+include $(RBCODECLIB_DIR)/codecs/librm/librm.make
+include $(RBCODECLIB_DIR)/codecs/libatrac/libatrac.make
+include $(RBCODECLIB_DIR)/codecs/libpcm/libpcm.make
+include $(RBCODECLIB_DIR)/codecs/libtta/libtta.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libay.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libgbs.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libhes.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libnsf.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libsgc.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libvgm.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libkss.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libemu2413.make
 
 # compile flags for codecs
-CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
-	-I$(APPSDIR)/codecs/lib -DCODEC
+CODECFLAGS = $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \
+			 -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC
 
 # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last
 # in a -ffoo -fno-foo pair, there is no need to filter them out
@@ -172,13 +172,13 @@ $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
 $(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECFLAGS) -c $< -o $@
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@

lib/rbcodec/codecs/demac/README

@@ -41,14 +41,14 @@ demac/libdemac/*.[ch] - The main libdemac code
 Latest Version
 
 The latest version of demac and libdemac can always be found in the
-"apps/codecs/demac/" directory in the Rockbox source.  You can check
+"lib/rbcodec/codecs/demac/" directory in the Rockbox source.  You can check
 this out from svn with the command:
 
-svn co svn://svn.rockbox.org/rockbox/trunk/apps/codecs/demac demac
+svn co svn://svn.rockbox.org/rockbox/trunk/lib/rbcodec/codecs/demac demac
 
 Or browse the source code online here:
 
-http://svn.rockbox.org/viewvc.cgi/trunk/apps/codecs/demac
+http://svn.rockbox.org/viewvc.cgi/trunk/lib/rbcodec/codecs/demac
 
 
 

lib/rbcodec/codecs/demac/libdemac.make

@@ -9,11 +9,11 @@
 
 # libdemac
 DEMACLIB := $(CODECDIR)/libdemac.a
-DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES)
+DEMACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/demac/libdemac/SOURCES)
 DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
 OTHER_SRC += $(DEMACLIB_SRC)
 ifeq ($(ARCH),arch_arm)
-OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S
+OTHER_SRC += $(RBCODECLIB_DIR)/codecs/demac/libdemac/udiv32_arm-pre.S
 endif
 DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB))
 DEMACLIB_OBJ_PRE := $(subst udiv32_arm.o,udiv32_arm-pre.o,$(DEMACLIB_OBJ))

lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S

@@ -33,7 +33,7 @@
    link of the APE codec, stating the amount of IRAM remaining for use by the
    reciprocal lookup table. */
 #if !defined(APE_PRE) && defined(USE_IRAM) && ARM_ARCH < 5
-#include "apps/codecs/ape_free_iram.h"
+#include "lib/rbcodec/codecs/ape_free_iram.h"
 #endif
 
 /* Codecs should not normally do this, but we need to check a macro, and

lib/rbcodec/codecs/lib/fixedpoint.c

@@ -0,0 +1 @@
+#include "../../../apps/fixedpoint.c"

lib/rbcodec/codecs/lib/libcodec.make

@@ -8,7 +8,7 @@
 #
 
 CODECLIB := $(CODECDIR)/libcodec.a
-CODECLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/lib/SOURCES)
+CODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/lib/SOURCES)
 CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC))
 OTHER_SRC += $(CODECLIB_SRC)
 
@@ -31,7 +31,7 @@ ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
     CODECLIBFLAGS += -ffunction-sections
 endif
 
-$(CODECDIR)/lib/%.o: $(ROOTDIR)/apps/codecs/lib/%.c
+$(CODECDIR)/lib/%.o: $(RBCODECLIB_DIR)/codecs/lib/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
 		-I$(dir $<) $(CODECLIBFLAGS) -c $< -o $@