Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-07 20:17:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

more resampling options

Browse Source
This commit is contained in:
philippe44
2019-06-27 22:29:10 -07:00
parent a75f1f0cd5
commit 0e3bc18748
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/codecs/component.mk
View File

@@ -12,7 +12,6 @@ COMPONENT_ADD_LDFLAGS=-l$(COMPONENT_NAME) \
$(COMPONENT_PATH)/lib/libresample16.a \ $(COMPONENT_PATH)/lib/libresample16.a \
$(COMPONENT_PATH)/lib/libsoxr.a $(COMPONENT_PATH)/lib/libsoxr.a
#$(COMPONENT_PATH)/lib/libfaad.a #$(COMPONENT_PATH)/lib/libfaad.a
#$(COMPONENT_PATH)/lib/libvorbisidec.a #$(COMPONENT_PATH)/lib/libvorbisidec.a
#$(COMPONENT_PATH)/lib/libogg.a #$(COMPONENT_PATH)/lib/libogg.a

11
components/codecs/inc/resample16/resample16.h
View File

@@ -74,11 +74,18 @@ typedef int WORD;
typedef unsigned int UWORD; typedef unsigned int UWORD;
struct resample16_s; struct resample16_s;
typedef struct {
UHWORD LpScl; /* Unity-gain scale factor */
UHWORD Nwing; /* Filter table size */
UHWORD Nmult; /* Filter length for up-conversions */
const HWORD *Imp; /* Filter coefficients */
const HWORD *ImpD; /* ImpD[n] = Imp[n+1]-Imp[n] */
} resample16_filter_t;
typedef enum { RESAMPLE16_FAST, RESAMPLE16_SMALL, RESAMPLE16_LARGE, RESAMPLE_CUSTOM } resample16_filter_e; typedef enum { RESAMPLE16_BASIC, RESAMPLE16_LOW, RESAMPLE16_MED } resample16_filter_e;
WORD resample16(struct resample16_s *r, HWORD X[], int inCount, HWORD Y[]); WORD resample16(struct resample16_s *r, HWORD X[], int inCount, HWORD Y[]);
struct resample16_s* resample16_create(double factor, resample16_filter_e filter, BOOL interp); struct resample16_s* resample16_create(float factor, resample16_filter_e filter, resample16_filter_t *custom, BOOL interp);
void resample16_delete(struct resample16_s *r); void resample16_delete(struct resample16_s *r);
void resample16_flush(struct resample16_s *r); void resample16_flush(struct resample16_s *r);

BIN
components/codecs/lib/libresample16.a
View File

Binary file not shown.

4
main/main.c
View File

@@ -112,8 +112,8 @@ static void usage(const char *argv0) {
" \t\t\t phase_response = 0-100 (0 = minimum / 50 = linear / 100 = maximum)\n" " \t\t\t phase_response = 0-100 (0 = minimum / 50 = linear / 100 = maximum)\n"
#endif #endif
#if RESAMPLE16 #if RESAMPLE16
" -R -u [params]\tResample, params = (i|m)[:i],\n" " -R -u [params]\tResample, params = (b|l|m)[:i],\n"
" \t\t\t i = linear interpolation, m = 13 taps filter, i = interpolate filter coefficients\n" " \t\t\t b = basic linear interpolation, l = 13 taps, m = 21 taps, i = interpolate filter coefficients\n"
#endif #endif
#if DSD #if DSD
#if ALSA #if ALSA

7
main/resample16.c
View File

@@ -116,7 +116,7 @@ bool resample_newstream(struct processstate *process, unsigned raw_sample_rate,
if (raw_sample_rate != outrate) { if (raw_sample_rate != outrate) {
LOG_INFO("resampling from %u -> %u", raw_sample_rate, outrate); LOG_INFO("resampling from %u -> %u", raw_sample_rate, outrate);
r.resampler = resample16_create((float) outrate / raw_sample_rate, RESAMPLE16_SMALL, false); r.resampler = resample16_create((float) outrate / raw_sample_rate, r.filter, NULL, false);
return true; return true;
@@ -147,8 +147,9 @@ bool resample_init(char *opt) {
} }
if (filter) { if (filter) {
if (*filter == 'm') r.filter = RESAMPLE16_SMALL; if (*filter == 'm') r.filter = RESAMPLE16_MED;
else r.filter = RESAMPLE16_FAST; else if (*filter == 'l') r.filter = RESAMPLE16_LOW;
else r.filter = RESAMPLE16_BASIC;
} }
if (interp && *interp == 'i') { if (interp && *interp == 'i') {