tsiry-sandratraina.com / rockbox-zig
Rockbox open source high quality audio player as a Music Player Daemon
mpris rockbox mpd libadwaita audio rust zig deno
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

Build librbcodec with DSP and metadata.

All associated files are moved to /lib/rbcodec.

Change-Id: I572ddd2b8a996aae1e98c081d06b1ed356dce222

authored by

Sean Bartell and committed by
Nils Wallménius b5716df4 24bd9d53

+97 -112
-54
apps/SOURCES
··· 26 26 menus/eq_menu.c 27 27 buffering.c 28 28 voice_thread.c 29 - replaygain.c 30 29 #else /* !SWCODEC */ 31 30 mpeg.c 32 31 #endif ··· 42 41 menus/time_menu.c 43 42 #endif 44 43 misc.c 45 - mp3data.c 46 44 onplay.c 47 45 playlist.c 48 46 playlist_catalog.c ··· 168 166 codec_thread.c 169 167 playback.c 170 168 codecs.c 171 - dsp.c 172 - compressor.c 173 169 #ifndef HAVE_HARDWARE_BEEP 174 170 beep.c 175 171 #endif 176 - #ifdef HAVE_PITCHSCREEN 177 - tdspeed.c 178 - #endif 179 172 #ifdef HAVE_RECORDING 180 173 enc_config.c 181 174 recorder/pcm_record.c 182 175 #endif 183 - eq.c 184 - #if defined(CPU_COLDFIRE) 185 - dsp_cf.S 186 - eq_cf.S 187 - #elif defined(CPU_ARM) 188 - dsp_arm.S 189 - #if ARM_ARCH >= 6 190 - dsp_arm_v6.S 191 - #endif 192 - eq_arm.S 193 - #endif 194 176 #endif 195 177 #ifdef USB_ENABLE_HID 196 178 usb_keymaps.c 197 179 #endif 198 180 #ifndef USB_NONE 199 181 gui/usb_screen.c 200 - #endif 201 - metadata.c 202 - metadata/id3tags.c 203 - metadata/mp3.c 204 - #if CONFIG_CODEC == SWCODEC 205 - metadata/metadata_common.c 206 - metadata/aiff.c 207 - metadata/ape.c 208 - metadata/asf.c 209 - metadata/adx.c 210 - metadata/flac.c 211 - metadata/monkeys.c 212 - metadata/mp4.c 213 - metadata/mpc.c 214 - metadata/ogg.c 215 - metadata/sid.c 216 - metadata/mod.c 217 - metadata/spc.c 218 - metadata/vorbis.c 219 - metadata/wave.c 220 - metadata/wavpack.c 221 - metadata/a52.c 222 - metadata/asap.c 223 - metadata/rm.c 224 - metadata/nsf.c 225 - metadata/oma.c 226 - metadata/smaf.c 227 - metadata/au.c 228 - metadata/vox.c 229 - metadata/tta.c 230 - metadata/ay.c 231 - metadata/gbs.c 232 - metadata/hes.c 233 - metadata/sgc.c 234 - metadata/vgm.c 235 - metadata/kss.c 236 182 #endif 237 183 #ifdef HAVE_TAGCACHE 238 184 tagcache.c
apps/compressor.c lib/rbcodec/dsp/compressor.c
apps/compressor.h lib/rbcodec/dsp/compressor.h
apps/dsp.c lib/rbcodec/dsp/dsp.c
apps/dsp.h lib/rbcodec/dsp/dsp.h
apps/dsp_arm.S lib/rbcodec/dsp/dsp_arm.S
apps/dsp_arm_v6.S lib/rbcodec/dsp/dsp_arm_v6.S
apps/dsp_asm.h lib/rbcodec/dsp/dsp_asm.h
apps/dsp_cf.S lib/rbcodec/dsp/dsp_cf.S
apps/eq.c lib/rbcodec/dsp/eq.c
apps/eq.h lib/rbcodec/dsp/eq.h
apps/eq_arm.S lib/rbcodec/dsp/eq_arm.S
apps/eq_cf.S lib/rbcodec/dsp/eq_cf.S
apps/eqs/Acoustic.cfg lib/rbcodec/dsp/eqs/Acoustic.cfg
apps/eqs/Bass.cfg lib/rbcodec/dsp/eqs/Bass.cfg
apps/eqs/Classical.cfg lib/rbcodec/dsp/eqs/Classical.cfg
apps/eqs/Default.cfg lib/rbcodec/dsp/eqs/Default.cfg
apps/eqs/Disco.cfg lib/rbcodec/dsp/eqs/Disco.cfg
apps/eqs/Electronic.cfg lib/rbcodec/dsp/eqs/Electronic.cfg
apps/eqs/Hip-Hop.cfg lib/rbcodec/dsp/eqs/Hip-Hop.cfg
apps/eqs/Jazz.cfg lib/rbcodec/dsp/eqs/Jazz.cfg
apps/eqs/Lounge.cfg lib/rbcodec/dsp/eqs/Lounge.cfg
apps/eqs/Pop.cfg lib/rbcodec/dsp/eqs/Pop.cfg
apps/eqs/R&B.cfg lib/rbcodec/dsp/eqs/R&B.cfg
apps/eqs/Rock.cfg lib/rbcodec/dsp/eqs/Rock.cfg
apps/eqs/Vocal.cfg lib/rbcodec/dsp/eqs/Vocal.cfg
+1 -1
apps/fracmul.h
··· 4 4 #include <stdint.h> 5 5 #include "gcc_extensions.h" 6 6 7 - /** FRACTIONAL MULTIPLICATION - TAKEN FROM apps/dsp.h 7 + /** FRACTIONAL MULTIPLICATION 8 8 * Multiply two fixed point numbers with 31 fractional bits: 9 9 * FRACMUL(x, y) 10 10 *
+1 -1
apps/metadata.c lib/rbcodec/metadata/metadata.c
··· 29 29 #include "cuesheet.h" 30 30 #include "metadata.h" 31 31 32 - #include "metadata/metadata_parsers.h" 32 + #include "metadata_parsers.h" 33 33 34 34 #if CONFIG_CODEC == SWCODEC 35 35
apps/metadata.h lib/rbcodec/metadata/metadata.h
apps/metadata/a52.c lib/rbcodec/metadata/a52.c
apps/metadata/adx.c lib/rbcodec/metadata/adx.c
apps/metadata/aiff.c lib/rbcodec/metadata/aiff.c
apps/metadata/ape.c lib/rbcodec/metadata/ape.c
apps/metadata/asap.c lib/rbcodec/metadata/asap.c
apps/metadata/asf.c lib/rbcodec/metadata/asf.c
apps/metadata/au.c lib/rbcodec/metadata/au.c
apps/metadata/ay.c lib/rbcodec/metadata/ay.c
apps/metadata/flac.c lib/rbcodec/metadata/flac.c
apps/metadata/gbs.c lib/rbcodec/metadata/gbs.c
apps/metadata/hes.c lib/rbcodec/metadata/hes.c
apps/metadata/id3tags.c lib/rbcodec/metadata/id3tags.c
apps/metadata/kss.c lib/rbcodec/metadata/kss.c
apps/metadata/metadata_common.c lib/rbcodec/metadata/metadata_common.c
apps/metadata/metadata_common.h lib/rbcodec/metadata/metadata_common.h
apps/metadata/metadata_parsers.h lib/rbcodec/metadata/metadata_parsers.h
apps/metadata/mod.c lib/rbcodec/metadata/mod.c
apps/metadata/monkeys.c lib/rbcodec/metadata/monkeys.c
apps/metadata/mp3.c lib/rbcodec/metadata/mp3.c
apps/metadata/mp4.c lib/rbcodec/metadata/mp4.c
apps/metadata/mpc.c lib/rbcodec/metadata/mpc.c
apps/metadata/nsf.c lib/rbcodec/metadata/nsf.c
apps/metadata/ogg.c lib/rbcodec/metadata/ogg.c
apps/metadata/oma.c lib/rbcodec/metadata/oma.c
apps/metadata/rm.c lib/rbcodec/metadata/rm.c
apps/metadata/sgc.c lib/rbcodec/metadata/sgc.c
apps/metadata/sid.c lib/rbcodec/metadata/sid.c
apps/metadata/smaf.c lib/rbcodec/metadata/smaf.c
apps/metadata/spc.c lib/rbcodec/metadata/spc.c
apps/metadata/tta.c lib/rbcodec/metadata/tta.c
apps/metadata/vgm.c lib/rbcodec/metadata/vgm.c
apps/metadata/vorbis.c lib/rbcodec/metadata/vorbis.c
apps/metadata/vox.c lib/rbcodec/metadata/vox.c
apps/metadata/wave.c lib/rbcodec/metadata/wave.c
apps/metadata/wavpack.c lib/rbcodec/metadata/wavpack.c
apps/mp3data.c lib/rbcodec/metadata/mp3data.c
apps/mp3data.h lib/rbcodec/metadata/mp3data.h
-1
apps/plugins/lrcplayer.c
··· 1113 1113 /******************************* 1114 1114 * read lyrics from id3 1115 1115 *******************************/ 1116 - /* taken from apps/metadata/mp3.c */ 1117 1116 static unsigned long unsync(unsigned long b0, unsigned long b1, 1118 1117 unsigned long b2, unsigned long b3) 1119 1118 {
apps/replaygain.c lib/rbcodec/metadata/replaygain.c
apps/replaygain.h lib/rbcodec/metadata/replaygain.h
apps/tdspeed.c lib/rbcodec/dsp/tdspeed.c
apps/tdspeed.h lib/rbcodec/dsp/tdspeed.h
+54
lib/rbcodec/SOURCES
··· 1 + metadata/metadata.c 2 + metadata/id3tags.c 3 + metadata/mp3.c 4 + metadata/mp3data.c 5 + #if CONFIG_CODEC == SWCODEC 6 + dsp/compressor.c 7 + dsp/dsp.c 8 + dsp/eq.c 9 + # if defined(CPU_COLDFIRE) 10 + dsp/dsp_cf.S 11 + dsp/eq_cf.S 12 + # elif defined(CPU_ARM) 13 + dsp/dsp_arm.S 14 + dsp/eq_arm.S 15 + # if ARM_ARCH >= 6 16 + dsp/dsp_arm_v6.S 17 + # endif 18 + # endif 19 + # ifdef HAVE_PITCHSCREEN 20 + dsp/tdspeed.c 21 + # endif 22 + metadata/replaygain.c 23 + metadata/metadata_common.c 24 + metadata/a52.c 25 + metadata/adx.c 26 + metadata/aiff.c 27 + metadata/ape.c 28 + metadata/asap.c 29 + metadata/asf.c 30 + metadata/au.c 31 + metadata/ay.c 32 + metadata/flac.c 33 + metadata/gbs.c 34 + metadata/hes.c 35 + metadata/kss.c 36 + metadata/mod.c 37 + metadata/monkeys.c 38 + metadata/mp4.c 39 + metadata/mpc.c 40 + metadata/nsf.c 41 + metadata/ogg.c 42 + metadata/oma.c 43 + metadata/rm.c 44 + metadata/sgc.c 45 + metadata/sid.c 46 + metadata/smaf.c 47 + metadata/spc.c 48 + metadata/tta.c 49 + metadata/vgm.c 50 + metadata/vorbis.c 51 + metadata/vox.c 52 + metadata/wave.c 53 + metadata/wavpack.c 54 + #endif
+19
lib/rbcodec/rbcodec.make
··· 1 + # __________ __ ___. 2 + # Open \______ \ ____ ____ | | _\_ |__ _______ ___ 3 + # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 4 + # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 5 + # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 6 + # \/ \/ \/ \/ \/ 7 + 8 + RBCODEC_LIB = $(RBCODEC_BLD)/librbcodec.a 9 + RBCODEC_SRC := $(call preprocess, $(RBCODEC_DIR)/SOURCES) 10 + RBCODEC_OBJ := $(call c2obj, $(RBCODEC_SRC)) 11 + INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp -I$(RBCODEC_DIR)/metadata 12 + OTHER_SRC += $(RBCODEC_SRC) 13 + 14 + $(RBCODEC_BLD)/%.o: $(RBCODEC_DIR)/%.c 15 + $(SILENT)mkdir -p $(dir $@) 16 + $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(RBCODEC_CFLAGS) -c $< -o $@ 17 + 18 + $(RBCODEC_LIB): $(RBCODEC_OBJ) 19 + $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
-41
lib/rbcodec/test/SOURCES
··· 1 1 warble.c 2 - ../../../apps/metadata.c 3 - ../../../apps/replaygain.c 4 2 ../../../firmware/buflib.c 5 3 ../../../firmware/core_alloc.c 6 4 ../../../firmware/common/strlcpy.c 7 5 ../../../firmware/common/unicode.c 8 6 ../../../firmware/common/structec.c 9 - ../../../apps/mp3data.c 10 7 ../../../apps/fixedpoint.c 11 8 ../../../uisimulator/common/io.c 12 - ../../../apps/compressor.c 13 - ../../../apps/dsp.c 14 - ../../../apps/eq.c 15 - ../../../apps/tdspeed.c 16 - ../../../apps/metadata/a52.c 17 - ../../../apps/metadata/adx.c 18 - ../../../apps/metadata/aiff.c 19 - ../../../apps/metadata/ape.c 20 - ../../../apps/metadata/asap.c 21 - ../../../apps/metadata/asf.c 22 - ../../../apps/metadata/au.c 23 - ../../../apps/metadata/ay.c 24 - ../../../apps/metadata/flac.c 25 - ../../../apps/metadata/gbs.c 26 - ../../../apps/metadata/hes.c 27 - ../../../apps/metadata/id3tags.c 28 - ../../../apps/metadata/kss.c 29 - ../../../apps/metadata/metadata_common.c 30 - ../../../apps/metadata/mod.c 31 - ../../../apps/metadata/monkeys.c 32 - ../../../apps/metadata/mp3.c 33 - ../../../apps/metadata/mp4.c 34 - ../../../apps/metadata/mpc.c 35 - ../../../apps/metadata/nsf.c 36 - ../../../apps/metadata/ogg.c 37 - ../../../apps/metadata/oma.c 38 - ../../../apps/metadata/rm.c 39 - ../../../apps/metadata/sgc.c 40 - ../../../apps/metadata/sid.c 41 - ../../../apps/metadata/smaf.c 42 - ../../../apps/metadata/spc.c 43 - ../../../apps/metadata/tta.c 44 - ../../../apps/metadata/vgm.c 45 - ../../../apps/metadata/vorbis.c 46 - ../../../apps/metadata/vox.c 47 - ../../../apps/metadata/wave.c 48 - ../../../apps/metadata/wavpack.c 49 -
+6 -2
lib/rbcodec/test/warble.make
··· 9 9 10 10 11 11 12 + RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec 13 + RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec 14 + 12 15 FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall 13 16 14 17 SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES) 15 18 16 19 INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \ 17 - -I$(ROOTDIR)/apps/gui -I$(ROOTDIR)/apps/metadata 20 + -I$(ROOTDIR)/apps/gui 18 21 INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ 19 22 -I$(ROOTDIR)/firmware/target/hosted \ 20 23 -I$(ROOTDIR)/firmware/target/hosted/sdl ··· 30 33 31 34 include $(ROOTDIR)/tools/functions.make 32 35 include $(ROOTDIR)/apps/codecs/codecs.make 36 + include $(ROOTDIR)/lib/rbcodec/rbcodec.make 33 37 34 38 $(BUILDDIR)/$(BINARY): $(CODECS) 35 39 36 - $(BUILDDIR)/$(BINARY): $$(OBJ) 40 + $(BUILDDIR)/$(BINARY): $$(OBJ) $(RBCODEC_LIB) 37 41 @echo LD $(BINARY) 38 42 $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+
+1 -1
tools/buildzip.pl
··· 444 444 if($swcodec) { 445 445 glob_mkdir("$temp_dir/eqs"); 446 446 447 - glob_copy("$ROOT/apps/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets 447 + glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets 448 448 } 449 449 450 450 glob_mkdir("$temp_dir/wps");
+4 -7
tools/database/SOURCES
··· 1 1 database.c 2 2 ../../apps/fixedpoint.c 3 - ../../apps/metadata.c 4 - #if CONFIG_CODEC == SWCODEC 5 - ../../apps/replaygain.c 6 - #endif 7 3 ../../apps/misc.c 8 - ../../apps/mp3data.c 9 4 ../../apps/tagcache.c 10 5 ../../firmware/common/crc32.c 11 6 ../../firmware/common/filefuncs.c ··· 17 12 ../../firmware/logf.c 18 13 ../../uisimulator/common/io.c 19 14 #if CONFIG_CODEC != SWCODEC 20 - ../../apps/metadata/id3tags.c 21 - ../../apps/metadata/mp3.c 15 + ../../lib/rbcodec/metadata/id3tags.c 16 + ../../lib/rbcodec/metadata/metadata.c 17 + ../../lib/rbcodec/metadata/mp3.c 18 + ../../lib/rbcodec/metadata/mp3data.c 22 19 #endif 23 20 /* Caution. metadata files do not add!! */
+3 -1
tools/database/database.make
··· 15 15 echo "\#endif" >> $(3); \ 16 16 echo $(3)) 17 17 18 - METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c)) 18 + METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) 19 19 20 20 SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ 21 21 $(METADATAS), \ ··· 28 28 -I$(ROOTDIR)/firmware/include \ 29 29 -I$(ROOTDIR)/apps \ 30 30 -I$(ROOTDIR)/apps/recorder \ 31 + -I$(ROOTDIR)/lib/rbcodec \ 32 + -I$(ROOTDIR)/lib/rbcodec/metadata \ 31 33 -I$(APPSDIR) \ 32 34 -I$(BUILDDIR) \ 33 35
+7 -2
tools/root.make
··· 95 95 else ifneq (,$(findstring warble,$(APP_TYPE))) 96 96 include $(ROOTDIR)/lib/rbcodec/test/warble.make 97 97 else 98 + RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec 99 + RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec 98 100 include $(APPSDIR)/apps.make 101 + include $(RBCODEC_DIR)/rbcodec.make 99 102 include $(APPSDIR)/lang/lang.make 100 103 101 104 ifdef SOFTWARECODECS ··· 205 208 $(call PRINTS,PP $(@F)) 206 209 $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) 207 210 208 - $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) 211 + $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) 209 212 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ 210 213 -L$(BUILDDIR)/firmware -lfirmware \ 214 + -L$(RBCODEC_BLD) -lrbcodec \ 211 215 -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ 212 216 $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ 213 217 $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ 214 218 $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map 215 219 216 - $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) 220 + $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) 217 221 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ 218 222 -L$(BUILDDIR)/firmware -lfirmware \ 223 + -L$(RBCODEC_BLD) -lrbcodec \ 219 224 -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ 220 225 $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ 221 226 $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \
+1 -1
uisimulator/uisimulator.make
··· 30 30 $(SILENT)$(shell rm -f $@) 31 31 $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null 32 32 33 - $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(UNWARMINDER) 33 + $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(RBCODEC_LIB) $(SKINLIB) $(UNWARMINDER) 34 34 $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ 35 35 -Wl,-Map,$(BUILDDIR)/rockbox.map 36 36