-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
blocks: added gr::blocks::short_to_float
- Loading branch information
Showing
9 changed files
with
242 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
<?xml version="1.0"?> | ||
<!-- | ||
################################################### | ||
##Short to Float: | ||
################################################### | ||
--> | ||
<block> | ||
<name>Short To Float</name> | ||
<key>blocks_short_to_float</key> | ||
<import>from gnuradio import blocks</import> | ||
<make>blocks.short_to_float($vlen, $scale)</make> | ||
<callback>set_scale($scale)</callback> | ||
<param> | ||
<name>Vec Length</name> | ||
<key>vlen</key> | ||
<value>1</value> | ||
<type>int</type> | ||
</param> | ||
<param> | ||
<name>Scale</name> | ||
<key>scale</key> | ||
<value>1</value> | ||
<type>real</type> | ||
</param> | ||
<sink> | ||
<name>in</name> | ||
<type>short</type> | ||
<vlen>$vlen</vlen> | ||
</sink> | ||
<source> | ||
<name>out</name> | ||
<type>float</type> | ||
<vlen>$vlen</vlen> | ||
</source> | ||
</block> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* -*- c++ -*- */ | ||
/* | ||
* Copyright 2012 Free Software Foundation, Inc. | ||
* | ||
* This file is part of GNU Radio | ||
* | ||
* GNU Radio is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 3, or (at your option) | ||
* any later version. | ||
* | ||
* GNU Radio is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with GNU Radio; see the file COPYING. If not, write to | ||
* the Free Software Foundation, Inc., 51 Franklin Street, | ||
* Boston, MA 02110-1301, USA. | ||
*/ | ||
|
||
#ifndef INCLUDED_BLOCKS_SHORT_TO_FLOAT_H | ||
#define INCLUDED_BLOCKS_SHORT_TO_FLOAT_H | ||
|
||
#include <blocks/api.h> | ||
#include <gr_sync_block.h> | ||
|
||
namespace gr { | ||
namespace blocks { | ||
|
||
/*! | ||
* \brief Convert stream of shorts to a stream of floats | ||
* \ingroup converter_blk | ||
* | ||
* \param vlen vector length of data streams. | ||
* \param scale a scalar divider to change the output signal scale. | ||
*/ | ||
class BLOCKS_API short_to_float : virtual public gr_sync_block | ||
{ | ||
public: | ||
|
||
// gr::blocks::short_to_float_ff::sptr | ||
typedef boost::shared_ptr<short_to_float> sptr; | ||
|
||
static sptr make(size_t vlen=1, float scale=1.0); | ||
|
||
/*! | ||
* Get the scalar divider value. | ||
*/ | ||
virtual float scale() const = 0; | ||
|
||
/*! | ||
* Set the scalar divider value. | ||
*/ | ||
virtual void set_scale(float scale) = 0; | ||
}; | ||
|
||
} /* namespace blocks */ | ||
} /* namespace gr */ | ||
|
||
#endif /* INCLUDED_BLOCKS_SHORT_TO_FLOAT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* -*- c++ -*- */ | ||
/* | ||
* Copyright 2012 Free Software Foundation, Inc. | ||
* | ||
* This file is part of GNU Radio | ||
* | ||
* GNU Radio is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 3, or (at your option) | ||
* any later version. | ||
* | ||
* GNU Radio is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with GNU Radio; see the file COPYING. If not, write to | ||
* the Free Software Foundation, Inc., 51 Franklin Street, | ||
* Boston, MA 02110-1301, USA. | ||
*/ | ||
|
||
#ifdef HAVE_CONFIG_H | ||
#include "config.h" | ||
#endif | ||
|
||
#include "short_to_float_impl.h" | ||
#include <gr_io_signature.h> | ||
#include <volk/volk.h> | ||
|
||
namespace gr { | ||
namespace blocks { | ||
|
||
short_to_float::sptr short_to_float::make(size_t vlen, float scale) | ||
{ | ||
return gnuradio::get_initial_sptr(new short_to_float_impl(vlen, scale)); | ||
} | ||
|
||
short_to_float_impl::short_to_float_impl(size_t vlen, float scale) | ||
: gr_sync_block("short_to_float", | ||
gr_make_io_signature (1, 1, sizeof(short)*vlen), | ||
gr_make_io_signature (1, 1, sizeof(float)*vlen)), | ||
d_vlen(vlen), d_scale(scale) | ||
{ | ||
const int alignment_multiple = | ||
volk_get_alignment() / sizeof(float); | ||
set_alignment(std::max(1, alignment_multiple)); | ||
} | ||
|
||
int | ||
short_to_float_impl::work(int noutput_items, | ||
gr_vector_const_void_star &input_items, | ||
gr_vector_void_star &output_items) | ||
{ | ||
const short *in = (const short *) input_items[0]; | ||
float *out = (float *) output_items[0]; | ||
|
||
if(is_unaligned()) { | ||
volk_16i_s32f_convert_32f_u(out, in, d_scale, d_vlen*noutput_items); | ||
} | ||
else { | ||
volk_16i_s32f_convert_32f_a(out, in, d_scale, d_vlen*noutput_items); | ||
} | ||
return noutput_items; | ||
} | ||
|
||
} /* namespace blocks */ | ||
}/* namespace gr */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* -*- c++ -*- */ | ||
/* | ||
* Copyright 2012 Free Software Foundation, Inc. | ||
* | ||
* This file is part of GNU Radio | ||
* | ||
* GNU Radio is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation; either version 3, or (at your option) | ||
* any later version. | ||
* | ||
* GNU Radio is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with GNU Radio; see the file COPYING. If not, write to | ||
* the Free Software Foundation, Inc., 51 Franklin Street, | ||
* Boston, MA 02110-1301, USA. | ||
*/ | ||
|
||
#ifndef INCLUDED_SHORT_TO_FLOAT_IMPL_H | ||
#define INCLUDED_SHORT_TO_FLOAT_IMPL_H | ||
|
||
#include <blocks/short_to_float.h> | ||
|
||
namespace gr { | ||
namespace blocks { | ||
|
||
class BLOCKS_API short_to_float_impl : public short_to_float | ||
{ | ||
size_t d_vlen; | ||
float d_scale; | ||
|
||
public: | ||
short_to_float_impl(size_t vlen, float scale); | ||
|
||
virtual float scale() const { return d_scale; } | ||
virtual void set_scale(float scale) { d_scale = scale; } | ||
|
||
int work(int noutput_items, | ||
gr_vector_const_void_star &input_items, | ||
gr_vector_void_star &output_items); | ||
}; | ||
|
||
} /* namespace blocks */ | ||
} /* namespace gr */ | ||
|
||
|
||
#endif /* INCLUDED_SHORT_TO_FLOAT_IMPL_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters