Changeset 1131:bca464362519 in roaraudio

Timestamp:

01/20/09 17:57:30 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to reset a filter(chain) :), works only for dcblock at the moment :(

Files:

• include/libroardsp/libroardsp.h (modified) (5 diffs)
• libroardsp/filter.c (modified) (2 diffs)
• libroardsp/filter_dcblock.c (modified) (1 diff)
• libroardsp/filterchain.c (modified) (1 diff)

include/libroardsp/libroardsp.h

@@ -58 +58 @@
 #define ROARDSP_FCTL_MODE             9
 
+// consts for filter(chain) reset:
+#define ROARDSP_RESET_NONE            0
+#define ROARDSP_RESET_FULL            1
+#define ROARDSP_RESET_STATE           2
+
 // filter specific constants:
 #define ROARDSP_DOWNMIX_LEFT          1
@@ -76 +81 @@
  int (*uninit)(struct roardsp_filter * filter);
  int (*ctl   )(struct roardsp_filter * filter, int cmd, void * data);
+ int (*reset )(struct roardsp_filter * filter, int what);
 };
 
@@ -115 +121 @@
 int    roardsp_filter_calc  (struct roardsp_filter * filter, void * data, size_t len);
 int    roardsp_filter_ctl   (struct roardsp_filter * filter, int cmd, void * data);
+int    roardsp_filter_reset (struct roardsp_filter * filter, int what);
 
 int roardsp_fchain_init  (struct roardsp_filterchain * chain);
@@ -120 +127 @@
 int roardsp_fchain_add   (struct roardsp_filterchain * chain, struct roardsp_filter * filter);
 int roardsp_fchain_calc  (struct roardsp_filterchain * chain, void * data, size_t len);
+int roardsp_fchain_reset (struct roardsp_filterchain * chain, int what);
 int roardsp_fchain_num   (struct roardsp_filterchain * chain);
 
@@ -161 +169 @@
 int roardsp_dcblock_uninit (struct roardsp_filter * filter);
 int roardsp_dcblock_calc16 (struct roardsp_filter * filter, void * data, size_t samples);
+int roardsp_dcblock_reset  (struct roardsp_filter * filter, int what);
 
 // codecs:

libroardsp/filter.c

@@ -31 +31 @@
  int (*uninit      )(struct roardsp_filter * filter);
  int (*ctl         )(struct roardsp_filter * filter, int cmd, void * data);
+ int (*reset       )(struct roardsp_filter * filter, int what);
  int (*calc  [5][3])(struct roardsp_filter * filter, void * data, size_t samples);
 } _roardsp_filterlist[] = {
- {ROARDSP_FILTER_AMP, "AMP", roardsp_amp_init, roardsp_amp_uninit, roardsp_amp_ctl, {
+ {ROARDSP_FILTER_AMP, "AMP", roardsp_amp_init, roardsp_amp_uninit, roardsp_amp_ctl, NULL, {
            {NULL, NULL, NULL},{roardsp_amp_calc8, NULL, NULL},{roardsp_amp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_ADD, "Add", roardsp_add_init, roardsp_amp_uninit, roardsp_amp_ctl, {
+ {ROARDSP_FILTER_ADD, "Add", roardsp_add_init, roardsp_amp_uninit, roardsp_amp_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_add_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
 #ifdef ROAR_HAVE_LIBM
- {ROARDSP_FILTER_LOWP, "Lowpass", roardsp_lowp_init, roardsp_lowp_uninit, roardsp_lowp_ctl, {
+ {ROARDSP_FILTER_LOWP, "Lowpass", roardsp_lowp_init, roardsp_lowp_uninit, roardsp_lowp_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_lowp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_HIGHP, "Highpass", roardsp_highp_init, roardsp_highp_uninit, roardsp_highp_ctl, {
+ {ROARDSP_FILTER_HIGHP, "Highpass", roardsp_highp_init, roardsp_highp_uninit, roardsp_highp_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_highp_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
 #endif
- {ROARDSP_FILTER_QUANTIFY, "Quantifier", roardsp_quantify_init, NULL, roardsp_quantify_ctl, {
+ {ROARDSP_FILTER_QUANTIFY, "Quantifier", roardsp_quantify_init, NULL, roardsp_quantify_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_quantify_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_CLIP, "Clip", roardsp_clip_init, NULL, roardsp_clip_ctl, {
+ {ROARDSP_FILTER_CLIP, "Clip", roardsp_clip_init, NULL, roardsp_clip_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_clip_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_DOWNMIX, "downmix", roardsp_downmix_init, NULL, roardsp_downmix_ctl, {
+ {ROARDSP_FILTER_DOWNMIX, "downmix", roardsp_downmix_init, NULL, roardsp_downmix_ctl, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, roardsp_downmix_calc162},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_DCBLOCK, "DCBlock", roardsp_dcblock_init, NULL, NULL, {
+ {ROARDSP_FILTER_DCBLOCK, "DCBlock", roardsp_dcblock_init, NULL, NULL, roardsp_dcblock_reset, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{roardsp_dcblock_calc16, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {-1, NULL, NULL, NULL, NULL, {
+ {-1, NULL, NULL, NULL, NULL, NULL, {
       // ?                  8Bit               16Bit              24Bit              32Bit
       // 0B:n     1     2   1B:n     1     2   2B:n     1     2   3B:n     1    2    4B:n     1     2
@@ -168 +169 @@
 }
 
+int    roardsp_filter_reset (struct roardsp_filter * filter, int what) {
+ if ( filter == NULL )
+  return -1;
+
+ if ( filter->reset )
+  return filter->reset(filter, what);
+
+ return -1;
+}
+
 //ll

libroardsp/filter_dcblock.c

@@ -54 +54 @@
 }
 
+int roardsp_dcblock_reset  (struct roardsp_filter * filter, int what) {
+ if ( filter == NULL )
+  return -1;
+
+ if ( filter->inst == NULL )
+  return -1;
+
+ switch (what) {
+  case ROARDSP_RESET_NONE:
+    return  0;
+   break;
+  case ROARDSP_RESET_FULL:
+    memset(filter->inst, 0, sizeof(struct roardsp_dcblock));
+    return  0;
+   break;
+  case ROARDSP_RESET_STATE:
+    memset(((struct roardsp_dcblock*)filter->inst)->dc, 0, sizeof(int32_t)*ROARDSP_DCBLOCK_NUMBLOCKS);
+    return  0;
+   break;
+  default:
+    return -1;
+ }
+
+ return -1;
+}
+
 int roardsp_dcblock_calc16  (struct roardsp_filter * filter, void * data, size_t samples) {
  struct roardsp_dcblock * inst = filter->inst;

libroardsp/filterchain.c

@@ -78 +78 @@
 }
 
+int roardsp_fchain_reset (struct roardsp_filterchain * chain, int what) {
+ int i;
+ int ret = 0;
+/*
+ struct roardsp_filterchain backup[1];
+*/
+
+ if ( chain == NULL )
+  return -1;
+
+/*
+ if ( what == ROARDSP_RESET_FULL ) {
+  if ( roardsp_fchain_init(backup) == -1 )
+   return -1;
+
+  if ( roardsp_fchain_uninit(chain) == -1 )
+   return -1;
+
+  if ( roardsp_fchain_init(chain) == -1 )
+   return -1;
+ } else {
+*/
+  for (i = 0; i < chain->filters; i++) {
+   if ( roardsp_filter_reset(chain->filter[i], what) == -1 )
+    ret = -1;
+  }
+/*
+ }
+*/
+
+ return ret;
+}
+
 int roardsp_fchain_num   (struct roardsp_filterchain * chain) {
  if ( chain == NULL )