comparison transform/FeatureExtractionModelTransformer.cpp @ 1837:1b688ab5f1b3

Unify various vectors to our base floatvec_t type; store columns in fft model cache at their desired height so we can return a reference (speeding up the peak-frequency spectrogram in particular)
author Chris Cannam
date Thu, 09 Apr 2020 11:22:55 +0100
parents 5f8fbbde08ff
children b504df98c3be
comparison
equal deleted inserted replaced
1835:804dd0c06f0e 1837:1b688ab5f1b3
1154 1154
1155 auto model = ModelById::getAs 1155 auto model = ModelById::getAs
1156 <BasicCompressedDenseThreeDimensionalModel>(outputId); 1156 <BasicCompressedDenseThreeDimensionalModel>(outputId);
1157 if (!model) return; 1157 if (!model) return;
1158 1158
1159 DenseThreeDimensionalModel::Column values = feature.values; 1159 DenseThreeDimensionalModel::Column values;
1160 values.insert(values.begin(),
1161 feature.values.begin(), feature.values.end());
1160 1162
1161 if (!feature.hasTimestamp && m_fixedRateFeatureNos[n] >= 0) { 1163 if (!feature.hasTimestamp && m_fixedRateFeatureNos[n] >= 0) {
1162 model->setColumn(m_fixedRateFeatureNos[n], values); 1164 model->setColumn(m_fixedRateFeatureNos[n], values);
1163 } else { 1165 } else {
1164 model->setColumn(int(frame / model->getResolution()), values); 1166 model->setColumn(int(frame / model->getResolution()), values);