Mercurial > hg > match-vamp
comparison src/MatchPipeline.cpp @ 183:24ddab06aace re-minimise
Toward allowing types to be small again. Doesn't currently build
author | Chris Cannam |
---|---|
date | Thu, 19 Feb 2015 17:17:20 +0000 |
parents | eeed3498fe96 |
children | f6be68852c1d |
comparison
equal
deleted
inserted
replaced
182:a67663dc698d | 183:24ddab06aace |
---|---|
53 { | 53 { |
54 feedFeatures(m_fe1.process(arr1), m_fe2.process(arr2)); | 54 feedFeatures(m_fe1.process(arr1), m_fe2.process(arr2)); |
55 } | 55 } |
56 | 56 |
57 void | 57 void |
58 MatchPipeline::feedFeatures(const vector<double> &f1, const vector<double> &f2) | 58 MatchPipeline::feedFeatures(const feature_t &f1, const feature_t &f2) |
59 { | 59 { |
60 m_f1 = f1; | 60 m_f1 = f1; |
61 m_f2 = f2; | 61 m_f2 = f2; |
62 | 62 |
63 #ifdef DEBUG_MATCH_PIPELINE | 63 #ifdef DEBUG_MATCH_PIPELINE |
72 | 72 |
73 feedConditionedFeatures(m_fc1.process(f1), m_fc2.process(f2)); | 73 feedConditionedFeatures(m_fc1.process(f1), m_fc2.process(f2)); |
74 } | 74 } |
75 | 75 |
76 void | 76 void |
77 MatchPipeline::feedConditionedFeatures(const vector<double> &c1, const vector<double> &c2) | 77 MatchPipeline::feedConditionedFeatures(const feature_t &c1, const feature_t &c2) |
78 { | 78 { |
79 m_c1 = c1; | 79 m_c1 = c1; |
80 m_c2 = c2; | 80 m_c2 = c2; |
81 | 81 |
82 #ifdef DEBUG_MATCH_PIPELINE | 82 #ifdef DEBUG_MATCH_PIPELINE |
101 | 101 |
102 ++m_frameNo; | 102 ++m_frameNo; |
103 } | 103 } |
104 | 104 |
105 void | 105 void |
106 MatchPipeline::extractFeatures(vector<double> &f1, vector<double> &f2) | 106 MatchPipeline::extractFeatures(feature_t &f1, feature_t &f2) |
107 { | 107 { |
108 f1 = m_f1; | 108 f1 = m_f1; |
109 f2 = m_f2; | 109 f2 = m_f2; |
110 } | 110 } |
111 | 111 |
112 void | 112 void |
113 MatchPipeline::extractConditionedFeatures(vector<double> &c1, vector<double> &c2) | 113 MatchPipeline::extractConditionedFeatures(feature_t &c1, feature_t &c2) |
114 { | 114 { |
115 c1 = m_c1; | 115 c1 = m_c1; |
116 c2 = m_c2; | 116 c2 = m_c2; |
117 } | 117 } |
118 | 118 |
119 bool | 119 bool |
120 MatchPipeline::aboveThreshold(const vector<double> &f) | 120 MatchPipeline::aboveThreshold(const feature_t &f) |
121 { | 121 { |
122 // This threshold is used only to determine when either of the | 122 // This threshold is used only to determine when either of the |
123 // input streams has ended -- the last frame for a stream is | 123 // input streams has ended -- the last frame for a stream is |
124 // considered to be the last one that was above the | 124 // considered to be the last one that was above the |
125 // threshold. This is different from the silence threshold in | 125 // threshold. This is different from the silence threshold in |