#define LOG_PREFIX "transform/scale"
struct context {
- double factor;
+ struct sr_rational factor;
};
static int init(struct sr_transform *t, GHashTable *options)
t->priv = ctx = g_malloc0(sizeof(struct context));
- ctx->factor = g_variant_get_double(g_hash_table_lookup(options, "factor"));
+ g_variant_get(g_hash_table_lookup(options, "factor"), "(xt)",
+ &ctx->factor.p, &ctx->factor.q);
return SR_OK;
}
struct sr_datafeed_packet **packet_out)
{
struct context *ctx;
+ const struct sr_datafeed_analog_old *analog_old;
const struct sr_datafeed_analog *analog;
struct sr_channel *ch;
GSList *l;
float *fdata;
+ float factor;
int i, num_channels, c;
if (!t || !t->sdi || !packet_in || !packet_out)
ctx = t->priv;
switch (packet_in->type) {
- case SR_DF_ANALOG:
- analog = packet_in->payload;
- fdata = (float *)analog->data;
- num_channels = g_slist_length(analog->channels);
- for (i = 0; i < analog->num_samples; i++) {
+ case SR_DF_ANALOG_OLD:
+ analog_old = packet_in->payload;
+ fdata = (float *)analog_old->data;
+ num_channels = g_slist_length(analog_old->channels);
+ factor = (float) ctx->factor.p / ctx->factor.q;
+ for (i = 0; i < analog_old->num_samples; i++) {
/* For now scale all values in all channels. */
- for (l = analog->channels, c = 0; l; l = l->next, c++) {
+ for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
ch = l->data;
(void)ch;
- fdata[i * num_channels + c] *= ctx->factor;
+ fdata[i * num_channels + c] *= factor;
}
}
break;
+ case SR_DF_ANALOG:
+ analog = packet_in->payload;
+ analog->encoding->scale.p *= ctx->factor.p;
+ analog->encoding->scale.q *= ctx->factor.q;
+ break;
default:
sr_spew("Unsupported packet type %d, ignoring.", packet_in->type);
break;
static const struct sr_option *get_options(void)
{
+ int64_t p = 1;
+ uint64_t q = 1;
+
/* Default to a scaling factor of 1.0. */
if (!options[0].def)
- options[0].def = g_variant_ref_sink(g_variant_new_double(1.0));
+ options[0].def = g_variant_ref_sink(g_variant_new("(xt)", &p, &q));
return options;
}