Remove some filter constructors, reset Z on configure().

This commit is contained in:
Jared Boone 2016-01-29 17:06:22 -08:00
parent d984532190
commit 28e5b7e4af
2 changed files with 4 additions and 24 deletions

View File

@ -179,10 +179,6 @@ static inline uint32_t scale_round_and_pack(
// FIRC8xR16x24FS4Decim4 ////////////////////////////////////////////////// // FIRC8xR16x24FS4Decim4 //////////////////////////////////////////////////
FIRC8xR16x24FS4Decim4::FIRC8xR16x24FS4Decim4() {
z_.fill({});
}
void FIRC8xR16x24FS4Decim4::configure( void FIRC8xR16x24FS4Decim4::configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale, const int32_t scale,
@ -196,6 +192,7 @@ void FIRC8xR16x24FS4Decim4::configure(
taps_[i+3] = taps[i+3] * negate_factor; taps_[i+3] = taps[i+3] * negate_factor;
} }
output_scale = scale; output_scale = scale;
z_.fill({});
} }
buffer_c16_t FIRC8xR16x24FS4Decim4::execute( buffer_c16_t FIRC8xR16x24FS4Decim4::execute(
@ -244,10 +241,6 @@ buffer_c16_t FIRC8xR16x24FS4Decim4::execute(
// FIRC8xR16x24FS4Decim8 ////////////////////////////////////////////////// // FIRC8xR16x24FS4Decim8 //////////////////////////////////////////////////
FIRC8xR16x24FS4Decim8::FIRC8xR16x24FS4Decim8() {
z_.fill({});
}
void FIRC8xR16x24FS4Decim8::configure( void FIRC8xR16x24FS4Decim8::configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale, const int32_t scale,
@ -261,6 +254,7 @@ void FIRC8xR16x24FS4Decim8::configure(
taps_[i+3] = taps[i+3] * negate_factor; taps_[i+3] = taps[i+3] * negate_factor;
} }
output_scale = scale; output_scale = scale;
z_.fill({});
} }
buffer_c16_t FIRC8xR16x24FS4Decim8::execute( buffer_c16_t FIRC8xR16x24FS4Decim8::execute(
@ -309,16 +303,13 @@ buffer_c16_t FIRC8xR16x24FS4Decim8::execute(
// FIRC16xR16x16Decim2 //////////////////////////////////////////////////// // FIRC16xR16x16Decim2 ////////////////////////////////////////////////////
FIRC16xR16x16Decim2::FIRC16xR16x16Decim2() {
z_.fill({});
}
void FIRC16xR16x16Decim2::configure( void FIRC16xR16x16Decim2::configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale const int32_t scale
) { ) {
std::copy(taps.cbegin(), taps.cend(), taps_.begin()); std::copy(taps.cbegin(), taps.cend(), taps_.begin());
output_scale = scale; output_scale = scale;
z_.fill({});
} }
buffer_c16_t FIRC16xR16x16Decim2::execute( buffer_c16_t FIRC16xR16x16Decim2::execute(
@ -363,16 +354,13 @@ buffer_c16_t FIRC16xR16x16Decim2::execute(
// FIRC16xR16x32Decim8 //////////////////////////////////////////////////// // FIRC16xR16x32Decim8 ////////////////////////////////////////////////////
FIRC16xR16x32Decim8::FIRC16xR16x32Decim8() {
z_.fill({});
}
void FIRC16xR16x32Decim8::configure( void FIRC16xR16x32Decim8::configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale const int32_t scale
) { ) {
std::copy(taps.cbegin(), taps.cend(), taps_.begin()); std::copy(taps.cbegin(), taps.cend(), taps_.begin());
output_scale = scale; output_scale = scale;
z_.fill({});
} }
buffer_c16_t FIRC16xR16x32Decim8::execute( buffer_c16_t FIRC16xR16x32Decim8::execute(

View File

@ -103,8 +103,6 @@ public:
Up = false Up = false
}; };
FIRC8xR16x24FS4Decim4();
void configure( void configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale, const int32_t scale,
@ -135,8 +133,6 @@ public:
Up = false Up = false
}; };
FIRC8xR16x24FS4Decim8();
void configure( void configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale, const int32_t scale,
@ -162,8 +158,6 @@ public:
using sample_t = complex16_t; using sample_t = complex16_t;
using tap_t = int16_t; using tap_t = int16_t;
FIRC16xR16x16Decim2();
void configure( void configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale const int32_t scale
@ -188,8 +182,6 @@ public:
using sample_t = complex16_t; using sample_t = complex16_t;
using tap_t = int16_t; using tap_t = int16_t;
FIRC16xR16x32Decim8();
void configure( void configure(
const std::array<tap_t, taps_count>& taps, const std::array<tap_t, taps_count>& taps,
const int32_t scale const int32_t scale